cyberpresidentvanellope/Paradise
1
0
Fork 0
mirror of https://github.com/ParadiseSS13/Paradise.git synced 2025-12-29 03:32:28 +00:00
Code Issues Packages Projects Releases Wiki Activity
40,144 Commits 26 Branches 2 Tags
dbc3d17cc5ce84febee2b48dc4bf59d94aa8b425
Commit Graph

4586 Commits

Author SHA1 Message Date
tigercat2000
dbc3d17cc5 Merge pull request #9857 from Agameofscones/ID_Sticker_Redux 
ID_Decal Sprites
 2018-10-18 11:26:59 -07:00
Mark Mak
35591ad940 Merge pull request #9889 from Squirgenheimer/cryoruntimefix 
adds sanity check to show_to for storage items
 2018-10-18 08:54:08 +08:00
Squirgenheimer
9280f9f9bd adds sanity check to show_to for storage items 2018-10-17 18:33:50 -04:00
Mark Mak
b418ee8401 Merge pull request #9828 from datlo/honkinfiltrationkit 
Adds the Honk Brand Infiltration Kit
 2018-10-17 21:35:06 +08:00
Mark Mak
a89f886a37 Merge pull request #9858 from Ty-Omaha/stunbaton-runtime 
Fixes stunbaton runtime
 2018-10-15 13:17:30 +08:00
Ty-Omaha
2862503d2b stunbaton runtime comment 2018-10-15 01:01:39 -04:00
Ty-Omaha
adbf0bb2cc stunbaton runtime fix 2018-10-15 00:54:17 -04:00
Gwydion Brain
d7ecb3bd8c Typo 2018-10-14 21:12:42 -07:00
Gwydion Brain
812c142fe9 Lil fixo 2018-10-14 21:06:37 -07:00
Gwydion Brain
09313bbea1 Initial 2018-10-14 21:04:12 -07:00
tigercat2000
315491786a Merge pull request #9838 from variableundefined/OreStackQOL 
CtrlShiftClick for stack
 2018-10-14 07:19:38 -07:00
Purpose
d11a0ac95b visibility 2018-10-14 11:52:09 +01:00
variableundefined
b097b06b72 CtrlShiftClick for stack 2018-10-13 23:04:50 +08:00
datlo
ac5cc480b9 Adds the Honk Brand Infiltration Kit 
Also adds the clown mask voice changer as part of the kit
 2018-10-12 17:02:55 +01:00
variableundefined
376cdc709a Merge pull request #9818 from farie82/twohanded-fix 
Fixes the giving of required two handed items and chainsaw stuf
 2018-10-12 13:24:19 +08:00
variableundefined
4de5284557 Merge pull request #9677 from DesolateG/global 
Updates global lists to the global var subsystem.
 2018-10-12 13:18:28 +08:00
tigercat2000
98c77fc466 Merge pull request #9343 from variableundefined/OreTGPort 
Port over tg ore stack and stack merging
 2018-10-11 19:34:13 -07:00
variableundefined
108ebfed3a Formatting improvement 2018-10-12 07:57:58 +08:00
joep van der velden
c96adec91f Fixed it 2018-10-11 22:55:10 +02:00
Desolate
f7627d2fcb Resolves conflicts. 2018-10-11 05:36:22 -05:00
lass9030
8111331094 Replaced code with procs, added return values. 2018-10-09 16:21:11 +02:00
variableundefined
6b1b38d4f1 Port over tg ore stack and stack merging 
Meta

Birbfix

Maxi

Re-add automatic satchel ore pickup (oops)

Mecha formatting

re
 2018-10-09 10:06:03 +08:00
variableundefined
c2bf480622 Merge pull request #9631 from Birdtalon/ERT-changes 
Gamma ERT Changes
 2018-10-09 08:58:15 +08:00
Purpose
4d7dd5a6c9 dayum dats defined 2018-10-08 22:48:00 +01:00
variableundefined
bc4a042d57 Merge pull request #9546 from SamHPurp/oh-come-on,-who-throws-a-baton,-i-mean-really 
Thrown Stunbatons have a low chance to stun
 2018-10-08 15:06:54 +08:00
Crazylemon64
3db4229918 First big chunk of the refactor 
mid-refactor of `take_overall_damage`

Fully refactors the (?:take|heal)_(?:overall|organ)_damage procs

Allows the dead to examine

Removes the `blinded` var

Refactor cyborg components so vision loss is instant

Robot life/death updates instantly

Adds instant updates for damage overlays and HUD icons for humans

Final reconciliation with the species refactor

Adds a stat debugging system and debugging logs

Also fixes instant death on species change

"Debugging logs" are used for stuff an admin wouldn't care about but
someone debugging would

I used it to fix people dying instantly when changing species due to
temporary deletion of the brain

Fox's requests

Adds a more careful updating system to our reagents system
 2018-10-07 17:52:04 -07:00
Birdtalon
074ee967e5 Merge branch 'master' into ERT-changes 2018-10-07 19:22:10 +01:00
Birdtalon
4151487c98 bugfixes 2018-10-07 18:49:48 +01:00
variableundefined
3c98bf5799 Merge pull request #9710 from SamHPurp/de-specifying 
Reduces incorrect use of station names.
 2018-10-07 22:52:27 +08:00
Purpose
63dfd411aa Resolved merge conflicts... I hope. 2018-10-06 16:01:34 +01:00
Purpose
ea74920535 no no no no cyberiaaaaad 2018-10-05 20:57:41 +01:00
Birdtalon
f877e6b90f adds sprite for T4 2018-10-03 22:20:05 +01:00
Desolate
c974e29a3c global lists global defined 2018-10-02 15:52:46 -05:00
Birdtalon
1628467857 Merge branch 'master' into ERT-changes 
# Conflicts:
#	icons/mob/head.dmi
 2018-09-30 14:53:32 +01:00
Birdtalon
c72561d194 addresses points in Purpose's review. Fixes some spans, replaces some 0,1 with TRUE,FALSE, uses some defines 2018-09-29 20:29:26 +01:00
Purpose
6cb07cb70c Fixes a bunch of shown messages 2018-09-29 19:10:10 +01:00
Purpose
c82cd93a89 Merge branch 'master' into Refactors-beds-stools-chairs 2018-09-29 15:36:27 +01:00
variableundefined
68c35ccced Merge pull request #9527 from Ty-Omaha/muh-art 
Fixes half the server crashing, removes canvases
 2018-09-29 07:49:30 +08:00
Birdtalon
deec79982e adds paranormal loadouts, alters ERT survival kit box, updates PDW 9 sprite, adds paranormal armour variants. 2018-09-28 19:22:55 +01:00
nicetoolbox
fdc7297954 Reveal speaker identity when using megaphone 2018-09-27 20:36:13 -07:00
Fox McCloud
c187559e83 Merge pull request #9599 from Agameofscones/lipstickcodefix 
Jade lipstick color fix (and minor refactor)
 2018-09-27 17:48:15 -04:00
Gwydion Brain
d426ed1879 Adds comments and loadout 2018-09-27 14:17:32 -07:00
tigercat2000
59fba23456 Merge pull request #9524 from alex-gh/autopsy_time_fix 
Autopsy scanner now prints all times in human readable format.
 2018-09-26 21:36:23 -07:00
Crazy Lemon
4991d152af Merge pull request #8811 from FalseIncarnate/kitchen 
Mixing Bowls and Kitchen refactors
 2018-09-26 17:32:39 -07:00
Crazy Lemon
ae68d43d46 Merge pull request #9032 from Anasari/CabinetDecon 
Allow you to construct & deconstruct fire extinguisher cabinet
 2018-09-26 17:31:15 -07:00
Crazy Lemon
f863b792bd Merge pull request #9601 from variableundefined/DropLocation 
Adds in drop_location & AllowDrop()
 2018-09-26 17:00:11 -07:00
Crazy Lemon
d3505ea9b9 Merge pull request #9543 from nicetoolbox/changeling-grab-fix 
Fix changeling tentacle grab
 2018-09-26 16:25:25 -07:00
Gwydion Brain
3e4c7b476b I have no idea how this works 2018-09-24 23:06:21 -07:00
Dedhia
524fdef17b General Fix 2018-09-24 20:36:17 -07:00
Dedhia
f68cf60f58 Fixes #9607 2018-09-24 15:16:16 -07:00