cyberpresidentvanellope/Paradise
1
0
Fork 0
mirror of https://github.com/ParadiseSS13/Paradise.git synced 2026-01-10 17:42:15 +00:00
Code Issues Packages Projects Releases Wiki Activity
39,007 Commits 26 Branches 2 Tags
6d4d4ba8a48cf98d2a2a8e8554be4797b97f3fd2
Commit Graph

8480 Commits

Author SHA1 Message Date
Aurorablade
6d4d4ba8a4 Merge branch 'master' of https://github.com/ParadiseSS13/Paradise into HereWeGoAgain 2018-09-06 21:46:19 -04:00
Crazy Lemon
f171317983 Merge pull request #9465 from shazbot194/xeno_borg_fix 
Fixes xeno borg
 2018-09-04 10:26:23 -07:00
Crazy Lemon
89c900064e Merge pull request #9478 from variableundefined/HivelordStabilize 
Fixes hivelord stabilizer
 2018-09-04 10:23:51 -07:00
Crazy Lemon
7cb8ffe1a7 Merge pull request #9418 from FreeStylaLT/TMs_PR 
Reposts #9340 - Kidan Sprite Stuff by TM
 2018-09-04 10:20:51 -07:00
Crazy Lemon
c37170b868 Merge pull request #9259 from Kyep/make_meth_less_op 
Reduces speed bonus from Meth
 2018-09-04 09:46:55 -07:00
Crazy Lemon
b52da17809 Merge pull request #9260 from Kyep/blob_mouse 
MouseBlobs
 2018-09-04 09:26:23 -07:00
Crazy Lemon
599c58fb53 Merge pull request #9369 from variableundefined/Analyzer 
Analyser > Analyzer
 2018-09-04 09:04:14 -07:00
variableundefined
5b8b4fee5f Fixes hivelord stabilizer 2018-09-03 10:10:27 +08:00
variableundefined
226e9a7b59 Fixes an accident 2018-08-31 17:46:05 +08:00
shazbot194
912b8a2223 Cleans up the code some 2018-08-30 21:33:12 -08:00
shazbot194
ab4ee9a355 Fixes xeno borg to not break 2018-08-30 20:12:12 -08:00
Fox McCloud
48e6b011b3 Merge pull request #9456 from variableundefined/MonitorRuntime2 
Fix monitor runtime
 2018-08-30 19:11:04 -04:00
variableundefined
556cf4f5e6 Fix monitor runtime 2018-08-30 19:06:29 +08:00
Crazy Lemon
6504d8b174 Merge pull request #9452 from Kyep/depot_armory_shield_init_fix 
Fixes depot armory Initialize() bug
 2018-08-29 19:41:39 -07:00
Alffd
87f2d9701f Fix check with emote on mute 2018-08-29 20:59:17 -04:00
Kyep
d47c98a997 fixes Initialize() bug 2018-08-29 14:51:45 -07:00
Crazy Lemon
4c1aa6ae35 Merge pull request #9434 from FlattestGuitar/nom-nom-handcuffs 
more consistent checks for dressing and undressing your boss
 2018-08-29 08:05:13 -07:00
Crazy Lemon
7ed0f2ad0c Merge pull request #9441 from Kyep/spider_obj_fixes 
Fixes #7089 - plus other bugs with spider obj attacks
 2018-08-29 08:04:04 -07:00
Kyep
032557fa21 Fixes #7089 plus other bugs with spider obj attacks 2018-08-28 17:25:12 -07:00
Unknown
cf9e3f6bef taking items off people is more consistent 
so is putting them on people
 2018-08-28 11:40:47 +02:00
Unknown
099c144a9e IPC screen color 2018-08-28 11:07:07 +02:00
Crazy Lemon
5b5934f276 Merge pull request #9420 from variableundefined/BorgAndAIRadioFix 
Restore radio privacy to oppressed silicons
 2018-08-27 23:53:46 -07:00
Crazy Lemon
9630f69edc Merge pull request #8940 from Allfd/shockcollar 
Adds shock muzzle
 2018-08-27 19:02:41 -07:00
variableundefined
688b510e63 Fixes borg & AI (and PAI) broadcasting what they say on the radio to everyone. 2018-08-26 22:48:35 +08:00
FreeStylaLT
adabbcbcca woops 2018-08-26 15:23:00 +03:00
FreeStylaLT
267fa29184 re-dos the PR 2018-08-26 11:20:39 +03:00
FishStix4Dayz
94b5b26418 deleted extra line of code 2018-08-24 19:20:47 -05:00
FishStix4Dayz
e55d50b199 New Vulp hairstyle 2018-08-23 22:28:51 -05:00
Crazy Lemon
058d339493 Merge pull request #9336 from Kyep/depot_fixes_1 
Depot Fixes
 2018-08-22 22:33:09 -07:00
Kyep
aad79ee59f fixes depot npc target jam on lockered targets 2018-08-22 13:11:19 -07:00
Kyep
a7c2f854b5 fixes depot syndimobs being immune to melee damage 2018-08-22 12:08:32 -07:00
Birdtalon
15c947a21c replaces equip_to_slot_or_del() with equip_to_slot_if_possible() 2018-08-21 19:00:57 +01:00
variableundefined
d2cf3353a8 Analyser > Analyzer 2018-08-16 21:01:13 +08:00
Alffd
f48b9bc5be Need to rebase it seems 2018-08-14 00:53:40 -04:00
Alffd
d94957f57d Even more fixes 2018-08-14 00:53:40 -04:00
Alffd
9f95664623 More fixes 2018-08-14 00:53:40 -04:00
Alffd
1c7923f6f7 Changes 3B 2018-08-14 00:53:40 -04:00
Alffd
9be1b8ed19 Changes 3 2018-08-14 00:53:40 -04:00
Alffd
73fc817635 CL changes round 2! 2018-08-14 00:53:40 -04:00
Alffd
b58e83da53 Fixes for CL 2018-08-14 00:53:40 -04:00
Alffd
48bc4ba081 Initial muzzle and emote changes 2018-08-14 00:53:39 -04:00
Aurorablade
1c74887124 Adds a small bit of info the to the cyborg analyzer 2018-08-10 23:13:02 -04:00
Aurorablade
384bdc4d0a Tweaks 
Fixed the errent space
Added a glass 'oil can' put two in robotcists locker (IPCS can drink oil to replenish it, this just makes it faster for the robos.)
 2018-08-10 01:53:28 -04:00
Aurorablade
ec66000ff7 Merge branch 'master' of https://github.com/ParadiseSS13/Paradise into HereWeGoAgain 2018-08-10 00:43:49 -04:00
Kyep
27473c3e3e better fix for boss cheese 2018-08-08 23:02:08 -07:00
Kyep
0fc53de09c fixes reactor sometimes not overloading, also an armory bypass 2018-08-08 14:55:52 -07:00
Kyep
2dd35bc894 Fixes 2018-08-08 10:39:25 -07:00
Crazy Lemon
6a925fb205 Merge pull request #8515 from Kyep/depot 
Reworks Syndicate Supply Depot
 2018-08-07 09:34:02 -07:00
Kyep
cfce50fe8a moves core to /area/ subtype, bugfix 2018-08-06 23:17:30 -07:00
Crazy Lemon
08044a6b58 Merge pull request #9266 from Kyep/simple_animal_intent 
Allows simple_animals to change intent
 2018-08-06 21:27:46 -07:00