cyberpresidentvanellope/Paradise
1
0
Fork 0
mirror of https://github.com/ParadiseSS13/Paradise.git synced 2025-12-26 18:21:56 +00:00
Code Issues Packages Projects Releases Wiki Activity
44,451 Commits 26 Branches 2 Tags
b5c322e00a2449b441ffb573f4c50135d0842e60
Commit Graph

1743 Commits

Author SHA1 Message Date
Mark van Alphen
bbeb07abd2 More lighting fixes 2019-05-04 03:06:10 +02:00
Mark van Alphen
d646ab0934 Merge branch 'master' of https://github.com/ParadiseSS13/Paradise into lighting 
# Conflicts:
#	code/game/area/Space Station 13 areas.dm
 2019-05-03 18:30:07 +02:00
Unknown
0d81c2da7c Adds Pig Crate 2019-05-01 14:19:43 -05:00
Mark van Alphen
ad2238f496 Merge branch 'master' into lighting 2019-04-30 19:15:58 +02:00
variableundefined
75a9ca9a10 Merge pull request #11397 from Arkatos1/cabinet 
Fire extinguisher cabinet QoL update
 2019-04-30 13:05:12 +08:00
Fox McCloud
7b57d2e319 fixups 2019-04-29 04:41:31 -04:00
Arkatos1
718d05f0fb Code review fixes 2019-04-28 20:27:45 +02:00
Arkatos1
3181843ce4 Code review fixes, no drop sanity check 2019-04-28 12:31:07 +02:00
Arkatos1
ce5cd16b7e Fire cabinet QoL update 2019-04-28 00:57:12 +02:00
Mark van Alphen
e4dd9110ee Merge branch 'master' of https://github.com/ParadiseSS13/Paradise into lighting 
# Conflicts:
#	paradise.dme
 2019-04-26 22:58:56 +02:00
Fox McCloud
0034e851a1 Kills off Object and Fast Object Processes 2019-04-23 23:53:40 -04:00
Mark van Alphen
c4dc5ecd3d Merge branch 'ambientocclusion' of https://github.com/Markolie/Paradise into lighting 2019-04-22 18:52:55 +02:00
Fox McCloud
d88411f947 Merge pull request #11255 from Markolie/safe 
Safe refactor
 2019-04-21 04:04:13 -04:00
Mark van Alphen
211468b24f Add fake ambient occlusion 2019-04-21 01:45:30 +02:00
joep van der velden
11abbd1ef2 Fixes windoors not spawning electronics once deconstructed 2019-04-17 12:09:20 +02:00
variableundefined
eb83a2dee7 Merge pull request #11285 from Fox-McCloud/elecrocution-refactor 
Refactors Electrocution
 2019-04-16 19:47:42 +08:00
Fox McCloud
58a7107eae shocking animals 2019-04-12 16:03:18 -04:00
Mark van Alphen
bfbebca770 Make sure images are qdel'd 2019-04-11 19:44:10 +02:00
Fox McCloud
93118f9d34 Remaps Toxins 2019-04-11 07:24:16 -04:00
Mark van Alphen
8c5847f9ea Code review fixes 2019-04-11 07:22:43 +02:00
Fox McCloud
90c9f3f479 Refacors Electrocution 2019-04-10 18:09:14 -04:00
Ionward
ba7491fa49 cleaned up and made all mantles a child of the base mantle 2019-04-09 02:54:06 -07:00
Ionward
a792d46085 adds mantles! 3 public access ones (in default clothes vendor,) and 6 command ones, each in their respective heads' lockers. 2019-04-09 01:06:19 -07:00
Mark van Alphen
dde5f1c04c Code review fixes 2019-04-07 18:48:34 +02:00
Mark van Alphen
a045382fb3 Fixes 2019-04-07 00:42:44 +02:00
Mark van Alphen
6425d6cc40 Refactor tumbling mechanism 2019-04-07 00:34:02 +02:00
Mark van Alphen
be92148517 Safe refactor 2019-04-06 23:20:26 +02:00
Fox McCloud
638c225397 Merge pull request #11140 from dovydas12345/Statues 
Removes a unneeded dot from diamond statue names
 2019-04-06 03:14:58 -04:00
variableundefined
58f253ad33 Merge pull request #11156 from farie82/big-wrapper-fix 
Wrapping big objects and welding lockers now takes time
 2019-04-02 18:34:05 +08:00
Fox McCloud
0b06a32cc9 Merge pull request #11165 from Markolie/issues 
Resolve some issues that the compiler doesn't spot
 2019-04-01 18:22:43 -04:00
Mark van Alphen
8cdb41b835 Switch around random calls 2019-04-01 18:29:01 +02:00
Mark van Alphen
d1f8adc724 Fix infinite loop in safes 2019-04-01 18:26:58 +02:00
Mark van Alphen
b8e840c094 Resolve some issues that the compiler doesn't spot 2019-03-29 16:21:15 +01:00
joep van der velden
7f8837723f target dun exist and user 2019-03-29 09:05:30 +01:00
joep van der velden
591b6b093f spacing 2019-03-28 23:29:36 +01:00
joep van der velden
b8a414a5c4 Also welding takes time now + usr 2019-03-28 23:26:57 +01:00
Fox McCloud
d0ea5ee8b9 Crit Rework Final Submission 2019-03-28 17:28:00 -04:00
Dovixx
1e388140e7 Change it 2019-03-26 18:59:53 +02:00
variableundefined
85ab7a8b06 Merge pull request #11065 from Fox-McCloud/pill-bottles-and-patch-packs 
[Goonchem] Pills, Bottles, Patches, and Pillbottles
 2019-03-24 17:51:00 +08:00
variableundefined
4ca33bb19d Merge pull request #11078 from Fox-McCloud/goonchem-reagent-temperature 
[Goonchem] Reagent Temperature and Pyrotechnics
 2019-03-24 17:50:07 +08:00
joep van der velden
f903290e1c better way 2019-03-24 07:59:39 +01:00
farie82
c05103c3f2 comments be gone 2019-03-23 15:18:00 +01:00
joep van der velden
f4168349e2 correct inflatable deflate items 2019-03-23 15:16:59 +01:00
joep van der velden
d04254a668 fixes more 2019-03-23 15:10:58 +01:00
joep van der velden
8b0334209d fixes the inflatable bug as well 2019-03-23 14:44:37 +01:00
joep van der velden
bc86d26058 fixed the atmos not updating 2019-03-23 14:38:27 +01:00
Fox McCloud
277722508a [Goonchem] Reagent Temperature 2019-03-18 20:06:15 -04:00
Fox McCloud
d8fce5bcdb don't map things in when you can add them to the code 2019-03-17 23:31:53 -04:00
Fox McCloud
d61bbe807d [Goonchem] Pills, Bottles, Patches, and Pillbottles 2019-03-17 21:30:10 -04:00
datlo
951f9c4928 add "voice" option to magic mirror 2019-02-22 02:05:34 +00:00