cyberpresidentvanellope/Paradise
1
0
Fork 0
mirror of https://github.com/ParadiseSS13/Paradise.git synced 2026-06-16 02:44:33 +01:00
Code Issues Packages Projects Releases Wiki Activity
28,512 Commits 15 Branches 2 Tags
732c3b4ae5fa94de9a3cd900fed520a73d1273d2
Commit Graph

13438 Commits

Author SHA1 Message Date
Tastyfish 8cd8ebffe3 Adds missing crushed cans, make cans that are technically bottles smash. 2016-04-30 20:12:48 -04:00
Tastyfish 646fb39f2d Replaces in-script json encoder/decoder with the native 510 procs 2016-04-30 19:15:07 -04:00
Aurorablade dbc65dc7ec tweaks on feedback 2016-04-30 16:04:56 -04:00
TheDZD 42a5810de3 Merge pull request #4326 from Fox-McCloud/even-less-lag 
Makes Explosion and Singulo Defer Based on CPU
 2016-04-30 09:57:01 -04:00
TheDZD 5ca5cff788 Merge pull request #4320 from IK3I/Tox-Comp-Fix 
Adds check for synthetic parts in tox-comp
 2016-04-30 09:34:55 -04:00
KasparoVy f95655419c Refactors Hair so it's on the Head + Adds a Vox Hairstyle + Adjusts Vox Hairstyle Names for Consistency -- PASS 1 
Also fixes a typo or two.

TO DO: FULLY TEST AND SWEEP FOR BUGS, ERRORS AND RUNTIMES
 2016-04-30 08:12:41 -04:00
Fox-McCloud 8322aa9338 Tesla Update/Rebalance 2016-04-30 06:44:01 -04:00
Fox-McCloud 2d90585ecc Makes Explosion and Singulo Defer Based on CPU 2016-04-30 05:17:45 -04:00
Tastyfish 3b59d2cd15 Defers pipenet and powernet rebuilds upon destruction of pipes and cables so explosions are faster 2016-04-29 23:42:47 -04:00
IK3I 8d18ce19df Incorporates Suggestions for code format 
Redoes get_damaged_organs() to use defines and flags instead of strings.
 2016-04-29 21:43:19 -05:00
Fox-McCloud f1acc84b8c Merge remote-tracking branch 'upstream/master' into hair 2016-04-29 19:48:49 -04:00
TheDZD 411dbdcf40 Merge pull request #4246 from FlattestGuitar/lightbulbs 
Lightbulbs no longer burn you, lighters do a bit less.
 2016-04-29 19:44:01 -04:00
Fox McCloud e34fa95fae Merge pull request #4187 from QuinnAggeler/Paradise-drask 
New race, the Drask
 2016-04-29 19:40:45 -04:00
HugoLuman c7d2359a1f Moves Drask to the end of the species list 
Puts them in proper numerical order in client procs.dm
 2016-04-29 14:08:11 -07:00
Fox-McCloud f543a60e30 circuit imprinter 2016-04-29 08:47:23 -04:00
Aurorablade 7e405427aa changess 2016-04-29 02:09:05 -04:00
Fox McCloud 7adaa11a46 Merge pull request #4317 from Tastyfish/check-antags 
Fixes Check Antagonists Panel
 2016-04-28 22:34:55 -04:00
Tastyfish 5268804db0 Fixes Check Antagonists Panel 2016-04-28 22:23:42 -04:00
HugoLuman 5dfb7b9851 Fixes the karma buy order in karma.dm 
Hopefully this won't mess up what species people have unlocked now
 2016-04-28 19:00:43 -07:00
HugoLuman 6285d42236 Fixes the karma buy order in client procs.dm 
Hopefully this won't rearrange what species people have unlocked now
 2016-04-28 18:59:53 -07:00
HugoLuman 4b52de7791 Sets the right alarm levels, removes ptless else 2016-04-28 18:45:21 -07:00
Fox McCloud a883a7a6f6 Merge pull request #4305 from LittleBigKid2000/whydoesitneedtobecanned 
Booze dispensers can now dispense synthanol
 2016-04-28 20:23:56 -04:00
Fox McCloud ad16e065af Merge pull request #4314 from Crazylemon64/autosay_fix 
Fixes autosay to no longer create AIs for their messages
 2016-04-28 20:23:37 -04:00
Fox McCloud b743ae0ac2 Merge pull request #4315 from IK3I/No-Drop-Holster-Fix 
Prevents Holstering of No-Drop items
 2016-04-28 20:23:24 -04:00
HugoLuman e255434a8f Adds the new alerts to Drask breath code 2016-04-28 16:36:44 -07:00
HugoLuman 97e07ba05f Fixes copy error, outdated alert code 
Removes outdated alert code for breath temperatures, fixes copy error in regen tier 1
 2016-04-28 16:15:39 -07:00
IK3I ec4ba9f5f6 Prevents Holstering of No-Drop items 2016-04-28 18:00:44 -05:00
Fox McCloud 8892def83c Merge pull request #4289 from pinatacolada/pman 
Plasma security now spawn with their gun in the bag
 2016-04-28 18:39:41 -04:00
Fox-McCloud d29ceda262 Merge remote-tracking branch 'upstream/master' into hair 2016-04-28 18:37:56 -04:00
Crazylemon64 501fa17958 Fixes autosay to no longer create AIs for their messages 2016-04-28 14:53:52 -07:00
Isaac Erwin 42c48eec77 Fixes the spacing on the dispensable reagents for the chem, booze, and soda dispensers 
Now's a better time than ever
 2016-04-28 09:08:02 -04:00
Isaac Erwin 013d334de0 Booze dispensers can now dispense synthanol 2016-04-27 19:40:53 -04:00
Aurorablade 68a4a0a417 Stealth canes 2016-04-27 19:33:10 -04:00
IK3I ad5c5dca39 Merge remote-tracking branch 'refs/remotes/ParadiseSS13/master' 
# Conflicts:
#	_maps/map_files/cyberiad/cyberiad.dmm
 2016-04-27 18:20:50 -05:00
Aurorablade 7a99d8fe74 Crazy Fethas Traitor Emporium of Horrors 2016-04-27 19:09:21 -04:00
TheDZD a820ef101f Merge pull request #4296 from CrAzYPiLoT-SS13/chess_print 
Makes gameboard circuits printable
 2016-04-27 18:50:34 -04:00
Fox McCloud 110958860b Merge pull request #4270 from FlattestGuitar/foamforce 
Ports /tg/ FOAM FORCE
 2016-04-27 11:43:55 -04:00
Mieszko Jędrzejczak ef13110610 Permanently dooms everyone and basically kills the universe. 2016-04-27 15:07:30 +02:00
Mieszko Jędrzejczak 6c21db1433 Adds different interactions on different intents 2016-04-27 12:10:48 +02:00
IK3I 7ea9dd2a36 Adds Pod Locks 
Adds key and tumbler based pod locks
Adds lock pod system
Adds pod lock to sec pod
Adds keys to sec pod in HoS and Pilot Offices
 2016-04-27 04:18:11 -05:00
Mieszko Jędrzejczak 9f8a8cef9b Grammar and that weird proc. 2016-04-27 10:56:04 +02:00
Tastyfish f8ebf7d672 Fixes reviving while restrained 2016-04-27 04:22:47 -04:00
pinatacolada e961d51472 removes judge dred 2016-04-27 01:39:29 +01:00
HugoLuman 5915619c4d Merge branch 'master' of https://github.com/QuinnAggeler/Paradise into Paradise-drask 
# Conflicts:
#	icons/mob/human_face.dmi
 2016-04-26 17:32:04 -07:00
TheDZD ddc459d92a Merge pull request #4189 from Fox-McCloud/xenobio-additions 
Xenobio Addition
 2016-04-26 20:23:49 -04:00
Fox-McCloud d5fb23d4d7 no fun crew has arrived 2016-04-26 20:12:31 -04:00
Fox McCloud c07b0130f1 Merge pull request #4297 from FlattestGuitar/examine 
Fixes Unathi examine message.
 2016-04-26 19:34:52 -04:00
TheDZD 8488c976e8 Merge pull request #4262 from KasparoVy/IPC-EXTRA-STUFF-REFACTOR 
Refactor FBP Parts & Adds Prosthetic Brand Models & More Antennae & Continued....
 2016-04-26 19:15:19 -04:00
TheDZD ebb124dfc9 Merge pull request #4282 from QuinnAggeler/IPCfix 
Fixes braindead IPC death message spam
 2016-04-26 19:14:10 -04:00
TheDZD 23174def7a Merge pull request #4283 from Tastyfish/checkout-my-moves 
Makes admin jump commands use forceMove(), improves forceMove
 2016-04-26 19:13:09 -04:00