cyberpresidentvanellope/Paradise
1
0
Fork 0
mirror of https://github.com/ParadiseSS13/Paradise.git synced 2026-01-20 22:42:54 +00:00
Code Issues Packages Projects Releases Wiki Activity
27,086 Commits 28 Branches 2 Tags
ce18b58e205711d7293d3aa160367a2c3a85e4f2
Commit Graph

20966 Commits

Author SHA1 Message Date
FalseIncarnate
ce18b58e20 Prevents splashing onto closed beakers 
Also removes relative pathing and replaces color macros in
glass_containers.dm
 2016-03-31 21:36:38 -04:00
FalseIncarnate
0d440f088a Notify player when filling full container from sink 2016-03-31 21:12:46 -04:00
Fox-McCloud
2fe3b35982 Shadowling Fix 2016-03-31 08:45:31 -04:00
Fox McCloud
68dd38c10d Merge pull request #4040 from Tastyfish/paichat 
Adds chatroom to PAIs
 2016-03-31 04:15:58 -04:00
Crazylemon64
221cbc82a9 I tested this, and IPCs should go blind upon losing their head 
I think the cause of this bug was organs not being removed on decap, which
has since been fixed
 2016-03-30 21:16:42 -07:00
Fox McCloud
d1765e0e14 Merge pull request #4019 from tigercat2000/disease1 
-tg- disease1
 2016-03-30 21:29:58 -04:00
Tigercat2000
ec3502af38 Fix the last of fox's noted bugs, runtime prevention 2016-03-30 18:12:03 -07:00
TheDZD
cc6e89ace8 Merge pull request #4030 from Fox-McCloud/advanced-camera-port 
Ports Advanced Cameras
 2016-03-30 18:48:16 -04:00
Fox-McCloud
9127c357e9 further thingssssssssssssssssssssssss 2016-03-30 18:17:55 -04:00
Fox McCloud
d83391fa68 Merge pull request #4005 from FlattestGuitar/alcohol 
Alcohol percentages!
 2016-03-30 16:44:41 -04:00
Fox McCloud
b15b640a24 Merge pull request #4038 from Aurorablade/DemonFixing 
fixes demons
 2016-03-30 16:34:22 -04:00
Fox McCloud
ec9a7a486d Merge pull request #3927 from Crazylemon64/metal_foam_space_flooring 
Metal foam walls will now also produce plating on space tiles
 2016-03-30 16:26:56 -04:00
Fox McCloud
0f8085e1d8 Merge pull request #3980 from Aurorablade/ArtsAndCrafts 
Fethas Carnival of Horrors:Rusty Iron Chef
 2016-03-30 16:25:27 -04:00
Tigercat2000
12efef6029 Add wizarditis as contraband for the MagiVend 2016-03-30 11:02:09 -07:00
Tigercat2000
917dc9ab54 Add PanDEMIC design datum 2016-03-30 10:58:24 -07:00
Tigercat2000
32c3cde6ad Fix advanced disease mixing (stupid fucking reagent code) 2016-03-30 10:55:22 -07:00
Tigercat2000
113c70a11b Fix Monkey-Transform disease 2016-03-30 10:55:17 -07:00
Tastyfish
80c0f0ee1f Make pai chatroom cost 5 2016-03-30 11:43:23 -04:00
Tigercat2000
25fa8ea2c9 viro consoles 2016-03-29 19:15:17 -07:00
Fox McCloud
acd72d796d Merge pull request #4028 from Tastyfish/statusdisplays 
Improves Shuttle ETA status display mode
 2016-03-29 21:55:17 -04:00
Tastyfish
9826985f3f Adds chatroom to PAIs 2016-03-29 21:44:29 -04:00
Fox-McCloud
c345b8a761 forcemove 2016-03-29 21:36:58 -04:00
Aurorablade
a34efa3af8 fixes demons 2016-03-29 20:51:16 -04:00
ProperPants
7e67a2bf34 Fixed some spacing. 2016-03-29 20:06:50 -04:00
ProperPants
15946be225 Operating tables can now be destroyed with a wrench. They give back as much plasteel as they cost to allow them to be moved. Trimmed dumb description for metal sheets. 2016-03-29 19:50:38 -04:00
TheDZD
4e5dca681b Merge pull request #4024 from Tastyfish/clickyclick 
Makes clicking a filled inventory slot's square be treated like clicking the item
 2016-03-29 17:14:39 -04:00
TheDZD
feec3ea1d8 Merge pull request #4025 from tigercat2000/20slots 
Change max character slots to 20
 2016-03-29 17:14:20 -04:00
TheDZD
efab653008 Merge pull request #4021 from Fox-McCloud/toy-tyrant 
Ends Science's Toy Tyranny
 2016-03-29 17:13:57 -04:00
Fox-McCloud
6648175a63 Ports Advanced Cameras 2016-03-29 06:05:59 -04:00
Crazylemon64
d113fc63e9 Removes dumbness 2016-03-28 23:47:50 -07:00
Crazylemon64
7aa519723b Merge branch 'master' of https://github.com/Crazylemon64/Paradise into metal_foam_space_flooring 2016-03-28 23:13:43 -07:00
Crazylemon64
00a39f5c83 Fixes stuff and stuff 2016-03-28 23:03:17 -07:00
Tigercat2000
61134f9ba4 Replace Synaptizine with Diphenhydramine, mineral for viro 2016-03-28 21:31:01 -07:00
Fox McCloud
65eab3d8c8 Merge pull request #4017 from ProperPants/WorkingBranch 
Additions to Engineering Cyborg and Maintenance Drones
 2016-03-29 00:17:23 -04:00
ProperPants
c1affcd02b Cyborg versions of some stuff. 
Added a line in some commentary that should have been there, but wasn't.
 2016-03-28 23:36:03 -04:00
ProperPants
cff2b62736 Deleted a blank line and some unused code that I came across. 
Tigercat2000 gave me permission.
 2016-03-28 22:51:27 -04:00
TheDZD
e827881c01 Merge pull request #4029 from Fox-McCloud/puke-fix 
Puke Fix
 2016-03-28 22:46:18 -04:00
TheDZD
5c800cec04 Merge pull request #4010 from Fox-McCloud/lusty-xeno-maid 
Ports Lusty Xenomorph Maid
 2016-03-28 22:45:41 -04:00
ProperPants
937a4c7479 Forgot something else 2016-03-28 22:42:12 -04:00
Fox-McCloud
c2fe562ad2 Puke Fix 2016-03-28 22:39:53 -04:00
Fox-McCloud
6b5e1904f5 tweaks 2016-03-28 22:28:19 -04:00
Aurorablade
918a0548db boopboop 2016-03-28 21:39:58 -04:00
Aurorablade
942bec06fc Merge branch 'master' of https://github.com/ParadiseSS13/Paradise into RevUpdates 2016-03-28 21:34:27 -04:00
Aurorablade
629faa14b3 boop 2016-03-28 21:33:42 -04:00
ProperPants
b5c073e58b Removes plasteel from drones and borgs. 2016-03-28 21:32:46 -04:00
TheDZD
69de9f1ced Merge pull request #4006 from FlattestGuitar/martial 
Fixes martial arts going away after boxing and booze
 2016-03-28 21:05:50 -04:00
Tastyfish
2b6b476bdd Improves Shuttle ETA status display mode 2016-03-28 20:28:03 -04:00
Tigercat2000
ad7357f24b Add more virus foods, move to newchem/disease.dm 2016-03-28 17:04:31 -07:00
TheDZD
afcdb0c40a Merge pull request #4011 from Fox-McCloud/xeno-brain-fix 
Xeno Brain Fixes
 2016-03-28 17:45:49 -04:00
ProperPants
0d9fc37065 Forgot a comma. 2016-03-28 17:16:31 -04:00