cyberpresidentvanellope/Paradise
1
0
Fork 0
mirror of https://github.com/ParadiseSS13/Paradise.git synced 2026-08-20 18:47:20 +01:00
Code Issues Packages Projects Releases Wiki Activity
13,633 Commits 17 Branches 2 Tags
2d85dab901d2df6ea25c4b264e2d37dc04f8b5c6
Commit Graph
13633 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
Mloc-Argent 2d85dab901 Merge branch 'dev' of github.com:Baystation12/Baystation12 into dev-freeze 2013-07-22 20:55:31 +01:00
Mloc 098f0f60e2 Merge pull request #3335 from Kilakk/dev 
Changed medical records "physical status" list to something more fitting, and fixed an issue with taking your ID out of the medical computer
 2013-07-22 12:54:41 -07:00
Kilakk 8766e4154d Changed the list of p_stats available in medical records 
Made it so removing an ID card from the medical computer puts the ID into your hand rather than onto the computer

List:
Active, *SSD*, *Deceased*, Physically Unfit, Disabled
 2013-07-22 15:10:25 -04:00
Mloc-Argent 2bec00d4e7 Merge branch 'dev' into dev-freeze 2013-07-22 17:47:45 +01:00
Jim "Apples" 2ce34fd024 Merge pull request #3334 from Mloc/beakers 
Beaker changes
 2013-07-22 09:46:20 -07:00
Mloc-Argent e7f38be3b4 Beakers and other glass containers now hide their contents, only showing the amount. 
Additionally, they can be labeled with a pen, up to a max of 10 characters.

Signed-off-by: Mloc-Argent <colmohici@gmail.com>
 2013-07-22 17:38:34 +01:00
Mloc-Argent 8421cd44df Upped the capacity of Eleanor Stone/RKF's custom teapot item to 150 units, by request. 
Signed-off-by: Mloc-Argent <colmohici@gmail.com>
 2013-07-22 17:37:39 +01:00
Mloc-Argent bdaabaec46 Merge branch 'master' of github.com:Baystation12/Baystation12 into dev 2013-07-22 14:42:50 +01:00
Mloc-Argent 2123389f94 Merge branch 'master' of github.com:Baystation12/Baystation12 into dev-freeze 2013-07-22 14:42:31 +01:00
Zuhayr 15f0853ea2 Merge pull request #3331 from BcTpe4HbIu/airalarm_fix 
Airalarm fix
 2013-07-22 04:04:00 -07:00
Igor Golubkov 3889716dd6 Fix Issue #3327 2013-07-22 10:26:48 +04:00
Igor Golubkov da14500268 Add error reporting on failed DB connection. 2013-07-22 09:19:19 +04:00
Chinsky a344010db4 Merge pull request #3330 from Kilakk/master 
Compile fix (read: I'm an idiot)
 2013-07-21 18:50:12 -07:00
Kilakk d369b9ffff Compile fix (read: I'm an idiot) 2013-07-21 19:49:30 -04:00
Chinsky f9b6ef3593 Merge pull request #3328 from Mloc/master 
Bugfixes.
 2013-07-21 16:42:29 -07:00
Mloc 09c17452e8 Merge pull request #3329 from Kilakk/master 
Small batch fix, voting cleanup, admin-ERT verb uncomment
 2013-07-21 16:40:02 -07:00
Kilakk e9483415d3 Fixes #3326 - uncommented admin-ERT verb 2013-07-21 19:38:32 -04:00
Kilakk afeb753f8e Cleaned up vote oocmute a tad 2013-07-21 19:26:05 -04:00
Kilakk 95e9cdde8d Fixed a really stupid batch mistake 2013-07-21 19:25:18 -04:00
Mloc-Argent f0e0951c1c Fixes #3230. 
Signed-off-by: Mloc-Argent <colmohici@gmail.com>
 2013-07-22 00:18:24 +01:00
Mloc-Argent c135d19b66 Partial fix for #2284. 
Signed-off-by: Mloc-Argent <colmohici@gmail.com>
 2013-07-21 17:05:10 +01:00
Mloc-Argent e4b67a3466 Fixes #3104. 
Signed-off-by: Mloc-Argent <colmohici@gmail.com>
 2013-07-21 16:55:30 +01:00
Mloc-Argent eef12bf252 Fixes #3324. 
Signed-off-by: Mloc-Argent <colmohici@gmail.com>
 2013-07-21 15:03:49 +01:00
Mloc-Argent 8575b7a286 And once again, did that the wrong way around. Whoops. 
Fully reverts #3316.

Signed-off-by: Mloc-Argent <colmohici@gmail.com>
 2013-07-20 18:41:50 +01:00
Mloc-Argent adc3c14779 Revert #3316 from BEF due to compile errors and (assumed) missing files. 
Signed-off-by: Mloc-Argent <colmohici@gmail.com>
 2013-07-20 18:38:00 +01:00
Mloc-Argent f29cd5946f Merge branch 'master' into bleeding-edge-freeze 2013-07-19 14:48:40 +01:00
Mloc 2288dc8abf Merge pull request #3318 from SkyMarshal/airfixes 
Hypothetically fixed two issues, both the airlock issue and ZAS not detecting the runtime that was occuring.
 2013-07-14 16:12:53 -07:00
SkyMarshal 46f808edf4 Hypothetically fixed two issues, both the airlock issue and ZAS not detecting the runtime that was occuring. Should still be verified on the live server before considered resolved. 2013-07-14 16:09:30 -07:00
Mloc c616d2b1c1 Merge pull request #3316 from LordBraindead/bleeding-edge-freeze 
fire update
 2013-07-14 15:13:46 -07:00
LordBraindead 5d63943d07 Update mineral.dm 
removed sheettpye = "plastic" again because it snuck back in after being removed already
 2013-07-14 21:50:48 +02:00
LordBraindead f172e085b1 Update changelog.html 
underped the changelog too
 2013-07-14 21:40:32 +02:00
LordBraindead 53c73f6b85 Update power_cells.dm 
derped a debug message into the commit
 2013-07-14 21:22:09 +02:00
LordBraindead 08d2e22220 fire update 
enabled fire to destroy floors and objects
also tweaked the behaviour of glass to enable glasslocks against fire
also made fire extingiushers stop being useless
 2013-07-14 21:20:45 +02:00
Mloc cfe45f9271 Merge pull request #3310 from Zuhayr/master 
Vox fixes.
 2013-07-13 03:03:12 -07:00
Zuhayr 07b9c30354 Vox raid spawn fixes. 2013-07-13 16:23:13 -07:00
Zuhayr 7faf895563 Robots will now spawn fully equipped. 2013-07-13 04:35:50 -07:00
Zuhayr dbe4838d40 Purging the toddler as Lord Mloc commands. 2013-07-13 04:34:09 -07:00
Zuhayr 71f36969b8 Robot health buffs, addition of armour component. 2013-07-13 04:33:48 -07:00
Chinsky 6c6b305f8f Merge pull request #3309 from fauxki/master 
Master - Map Fixes
 2013-07-13 01:42:44 -07:00
fauxtada 85f4403ac2 Master Map Fixes 
- Properly aligns doors in AI core and Gateway room.
- Fixes issue with engineering pod getting it's nose cut off by moving it to the correct transit zone.
 2013-07-13 00:36:48 -07:00
Mloc 836aab6378 Merge pull request #3307 from Zuhayr/master 
Robot fixes, removal of toddler item.
 2013-07-12 11:36:27 -07:00
Mloc 1af9a7bc60 Git, I shall never understand thee. Oh well. 2013-07-12 15:20:49 +01:00
Mloc-Argent cac7a5420e Merge branch 'master' of github.com:Baystation12/Baystation12 2013-07-12 13:32:36 +01:00
Mloc-Argent b5c63c2a66 I have honestly no idea what happened there. Fucking git. 
This reverts commit a2fddc0fc1.

Signed-off-by: Mloc-Argent <colmohici@gmail.com>
 2013-07-12 13:31:26 +01:00
Mloc-Argent c3c84614b8 Update MOTD for new bugtracker link. 
Signed-off-by: Mloc-Argent <colmohici@gmail.com>
 2013-07-12 13:10:48 +01:00
Mloc-Argent c6a9bbc9fc Properly reverts Kida. (what a mess) 
Signed-off-by: Mloc-Argent <colmohici@gmail.com>
 2013-07-12 12:48:07 +01:00
Zuhayr 29cb9efa04 Merge pull request #3306 from Mloc/master 
Update MOTD for new bugtracker link.
 2013-07-12 04:15:13 -07:00
Zuhayr 84829a0a35 Merge pull request #3305 from Mloc/master 
Properly reverts Kida.
 2013-07-12 03:51:00 -07:00
Zuhayr 17ff989194 Merge pull request #3304 from Mloc/master 
Removes Kida
 2013-07-12 03:32:10 -07:00
Mloc-Argent 66a8536c94 Revert "Adds in the icon files for Kidan and fixes issue" 
This reverts commit 9139a70d8c.
 2013-07-12 12:22:58 +01:00