cyberpresidentvanellope/Paradise
1
0
Fork 0
mirror of https://github.com/ParadiseSS13/Paradise.git synced 2026-08-17 09:07:10 +01:00
Code Issues Packages Projects Releases Wiki Activity
21,672 Commits 17 Branches 2 Tags
e641c847d662edea15d22f041eebfc4c384bbe71
Commit Graph
16636 Commits
Author SHA1 Message Date
ZomgPonies e641c847d6 Merge pull request #1233 from Fox-McCloud/stun-balance 
Stun+Weaken Balancing
 2015-06-01 15:20:19 -04:00
ZomgPonies 16aff7c7ff Merge pull request #1236 from Fox-McCloud/grenade-hands 
Adds Grenade, Flash, and EMP in-hands
 2015-06-01 15:19:59 -04:00
Fox-McCloud e71bcdb9d0 Adds Grenade, Flash, and EMP in-hands 2015-05-31 16:39:41 -04:00
ZomgPonies 0eb258798d Merge pull request #1225 from Fox-McCloud/spider-balance 
Spider Event Balance
 2015-05-31 14:18:17 -04:00
AranclanosandTigercat2000 58339aaee8 Malf factory-builder overlay. 
Added an overlay for the AI when she tries to spawn a robotic factory so
the user gets some feedback of where they are building.

Fixes numerous exploits to spawn several factories.
Fixes tgstation/-tg-station#1259
 2015-05-31 09:32:42 -07:00
Fox-McCloud e098364432 Stun+Weaken Balancing 2015-05-31 06:35:14 -04:00
ZomgPonies 5e884204e4 Merge pull request #1224 from Fox-McCloud/Mob-blob-rebalance 
Mob and Blob Damage Rebalance
 2015-05-31 02:59:00 -04:00
ZomgPonies 7b146cad8a Merge pull request #1222 from Fox-McCloud/rampant-Brand 
Rampant Brand Rework
 2015-05-31 02:58:48 -04:00
Tigercat2000 ba646c51a1 Fix being able to throw people while not next to them 2015-05-30 20:30:43 -07:00
Tigercat2000 c861540dbb Fix headbutting. For the 3rd time. 
Jeez, I should take some lessons on ACTUALLY FIXING BUGS.
 2015-05-30 20:21:40 -07:00
ZomgPonies e5f026d02e Merge pull request #1216 from tigercat2000/OHGODIHAVETOTESTTHIS 
Port Atlas's implementation of -tg-'s canvas art.
 2015-05-30 20:17:41 -04:00
ZomgPonies c0406687e0 Merge pull request #1215 from tigercat2000/Necastuff 
Disable enemy-intercept and automatic code blue, by request of Necaladun.
 2015-05-30 15:02:11 -04:00
TheDZD fa39af5994 Merge pull request #1227 from Fox-McCloud/NSS 
Fixes NCS Cyberiad References
 2015-05-30 10:12:20 -04:00
TheDZD bb921b552d Merge pull request #1153 from tigercat2000/BUILDMODEINf 
Adds area generators to build mode - Take 2 [DNM]
 2015-05-30 09:56:36 -04:00
Fox-McCloud 8964acdd04 Fixes NCS Cyberiad References 2015-05-30 07:18:21 -04:00
Fox-McCloud 7a8a258a87 Merge pull request #1226 from Krausus/Fixes-201505300219 
Various Minor Fixes
 2015-05-30 07:00:48 -04:00
Krausus f84e7e8e8d Fixes losing items when dismantling machine frames 2015-05-30 06:25:46 -04:00
Krausus 8ab18c27d8 Fixes some Stat procs statting to the wrong panel 2015-05-30 06:18:18 -04:00
Krausus 887a4bad03 Fixes corgis consuming food at warp speed 
Also fixes a small issue with the code that restores corgi health when
they eat.
 2015-05-30 05:48:03 -04:00
Krausus 755467ac20 Fixes examining those with limb stumps/accessories 
Limb stumps would show as "He has a limb stump on his limb stump", and
accessories would be lowercased and worded poorly.
 2015-05-30 05:35:18 -04:00
Fox-McCloud 767e70f218 Spider Event Balance 2015-05-30 04:36:42 -04:00
Krausus 9f1f0a9cfa Fixes quick-equipped accessories lingering in hands 2015-05-30 04:35:10 -04:00
Fox-McCloud c7bfba28e4 Mob and Blob Damage Rebalance 2015-05-30 04:13:12 -04:00
Krausus f13dccd776 Fixes laptop vendors asking for unneeded PINs 
Also fixes some minor typos in the HTML generation.
 2015-05-30 04:01:30 -04:00
Krausus f4ee808e6a Fixes adding/removing null languages through VV 
These would attempt to add/remove null languages if the language
selection was canceled.
 2015-05-30 03:31:15 -04:00
Krausus d7260c87b9 Fixes admins disabling shadowlings/thralls 
Fixes the Shadowling Hivemind language being entirely deleted and
shadowling abilities not being removed
 2015-05-30 03:23:47 -04:00
ZomgPonies f57359069a Merge pull request #1223 from Fox-McCloud/fix-stuff-ok-whatever-fixed-but-why-fine-fixed-anyway 
Fixes and Tweaks to Defenses
 2015-05-30 02:35:51 -04:00
Fox-McCloud 0602435d8a Fixes and Tweaks to Defenses 2015-05-30 01:47:25 -04:00
Fox-McCloud 66b673f1f4 Rampant Brand Rework 2015-05-29 23:05:26 -04:00
ZomgPonies 47ab558908 Merge pull request #1210 from TheDZD/CLICK-CLICK 
Adminbooze Crab Proc Uncommenting
 2015-05-29 21:44:45 -04:00
Fox-McCloud 190b1c8073 LINDA Fix for Turfs 2015-05-29 21:07:56 -04:00
ZomgPonies 01896f9209 Merge pull request #1208 from tigercat2000/coloredtilelight 
Colored Light Tiles
 2015-05-29 19:36:56 -04:00
TheDZD 5c63a670a6 Merge pull request #1219 from ZomgPonies/piefix 
Who needs cream pie logging anyways
 2015-05-29 19:15:32 -04:00
ZomgPonies f8878438af Who needs cream pie logging anyways 2015-05-29 19:09:20 -04:00
TheDZD d2eb5f0081 Merge pull request #1218 from ZomgPonies/piefix 
Small sprite fix
 2015-05-29 18:54:48 -04:00
ZomgPonies f27eef3e48 Small sprite fix 2015-05-29 18:51:16 -04:00
Tigercat2000 cced767094 Port Atlas's implementation of -tg-'s canvas art. 2015-05-29 15:43:42 -07:00
TheDZD d0eed9abf0 Merge pull request #1204 from ZomgPonies/chingchong 
Adds chickenman and clown statues
 2015-05-29 18:29:11 -04:00
ZomgPonies 30a9108282 Merge pull request #1207 from TheDZD/associative-list-varedit-fix 
Ports /tg/ varedit improvements
 2015-05-29 18:19:49 -04:00
ZomgPonies e7f38b2e5c Merge branch 'master' of https://github.com/ParadiseSS13/Paradise into chingchong 
Conflicts:
	_maps/map_files/cyberiad/cyberiad.dmm
 2015-05-29 17:53:07 -04:00
TheDZD 38d3eeaa31 Merge pull request #1206 from ZomgPonies/piecannon 
Adds Piecannons to HONKsquad
 2015-05-29 17:41:18 -04:00
Tigercat2000 cb7a180b6e Disable intercept and auto-blue-alert. 
This PR Temporarily disables the intercept and automatic-blue-alert until
the system can properly be removed.
 2015-05-29 10:17:44 -07:00
ZomgPonies ab3267f897 Merge pull request #1213 from Krausus/AirFixes-201505290432 
Minor Atmos Fixes
 2015-05-29 12:37:40 -04:00
ZomgPonies 16c2189260 Merge pull request #1214 from Krausus/NoRandomHeads 
Fixes Random Jobs Including Command and Whitelisted Positions
 2015-05-29 12:37:00 -04:00
ZomgPonies 86497ed03f Merge pull request #1200 from tigercat2000/Overflow 
Overflow Rerouting System
 2015-05-29 12:35:18 -04:00
Krausus 6273700c7a Fixes Job Randomization Exclusions 2015-05-29 08:44:27 -04:00
Krausus 778f928e6b Fixes canisters not exciting the air when broken 2015-05-29 05:11:57 -04:00
Krausus c8ea42f8f7 Fixes tiles not updating their air when deleted 
Also, reverts a workaround that was necessary to compensate for this
bug.
 2015-05-29 04:40:17 -04:00
ZomgPonies 277a900aa7 Merge pull request #1193 from Fox-McCloud/mobs-pets-stuffs 
Simple Animal Refactor+Update+Fixes and Pet Collars
 2015-05-28 22:45:03 -04:00
Fox-McCloud 42465737ed inherited 2015-05-28 22:41:17 -04:00