cyberpresidentvanellope/Paradise
1
0
Fork 0
mirror of https://github.com/ParadiseSS13/Paradise.git synced 2026-01-11 10:02:24 +00:00
Code Issues Packages Projects Releases Wiki Activity
40,031 Commits 26 Branches 2 Tags
216f03ddca04b41dbdc69b40f4d05ea75f3846d0
Commit Graph

29506 Commits

Author SHA1 Message Date
Ty-Omaha
216f03ddca moves boxing attack logs to the ALL preference 2018-10-12 23:28:04 -04:00
Ty-Omaha
c2d6726168 Update code/modules/martial_arts/brawling.dm 2018-10-12 23:25:10 -04:00
Ty-Omaha
d84c191a88 removes boxing attack logs 2018-10-12 22:54:39 -04:00
DarkPyrolord
f22e21a0e2 SpamBGone 2018-10-13 14:43:27 +13:00
Mark Mak
384fd41a82 Merge pull request #9822 from FlimFlamm/branch1 
Fixes newscaster images and spruces up newscaster feed message formating
 2018-10-13 09:20:54 +08:00
Mark Mak
21cae85a91 Merge pull request #9830 from Birdtalon/chem 
Small chem master icon fix/cleanup
 2018-10-13 09:02:25 +08:00
alex-gh
d206760dc7 Refactored code to use the reagent check_and_add proc 2018-10-13 01:23:08 +02:00
Birdtalon
98a084921f moves chem master to using update_icon() fixes not using no power sprites 2018-10-13 00:22:03 +01:00
alex-gh
54858a45b6 Prevents organs from going necrotic during abducter surgery. 2018-10-13 01:00:30 +02:00
Mark Mak
e79e3366db Merge pull request #9827 from Birdtalon/check-and-add 
Moves check_and_add() to reagents holder
 2018-10-13 06:36:59 +08:00
Birdtalon
e9d153daf4 moves check and add to reagents holder datum 2018-10-12 15:59:30 +01:00
Birdtalon
228ba156ca adds nullrod to gamma paranormal 2018-10-12 15:41:06 +01:00
variableundefined
9dbd3445ab Merge pull request #9821 from SamHPurp/grime/dirt-away 
Away Missions dirt grime and decals
 2018-10-12 13:55:40 +08:00
variableundefined
96f5046f19 Merge pull request #9817 from SamHPurp/stool-bed-chair-fixes 
A few fixes
 2018-10-12 13:48:02 +08: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
variableundefined
cb4d170cfb Merge pull request #9815 from TDSSS/name-fix 
Lets agent IDs and ID computers set Skrell names correctly.
 2018-10-12 12:37:32 +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
FlimFlamm
d9ed6ca46a Fixes newscaster images and spruces up newscaster feed message formatting 2018-10-11 22:09:18 -03:00
Desolate
4abad57dc3 ERT.. damn you 2018-10-11 19:39:34 -05:00
variableundefined
108ebfed3a Formatting improvement 2018-10-12 07:57:58 +08:00
Purpose
f0e943ab36 visible in the inspector 2018-10-12 00:19:00 +01:00
Desolate
46dd98f4e0 oops 2018-10-11 16:26:06 -05:00
Purpose
6c6d35d133 fixies 2018-10-11 22:02:23 +01: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
TDSSS
aab487ba29 fixed 2018-10-11 12:18:26 +02:00
variableundefined
fc27b8b7f1 Merge pull request #9726 from Agameofscones/thatdanguy23_fluff_t2 
Rissa's Fluff Item
 2018-10-11 11:30:59 +08:00
variableundefined
7882e5abca Merge pull request #9811 from Kyep/ert_fix 
Fixes #9612 - ert panel not working for carbon mobs
 2018-10-11 10:26:15 +08:00
variableundefined
f58b405580 Merge pull request #9809 from Agameofscones/necklaces_fix_reeeee 
Necklace equip location fix
 2018-10-11 09:50:59 +08:00
variableundefined
7cb45b93ec Merge pull request #9806 from farie82/dna.species-runtime-fix 
Fixes the NPCs not being initialised correctly
 2018-10-11 09:16:01 +08:00
Kyep
9cfee0afd5 space 2018-10-10 18:01:00 -07:00
Kyep
280ec3746b cleanup, better to use the default 2018-10-10 17:58:30 -07:00
Kyep
559eae16cd Fixes #9612 - ert panel not working for carbon mobs 2018-10-10 17:48:16 -07:00
Gwydion Brain
516942a6ee Removes Terrible Implementation 2018-10-10 16:15:07 -07:00
joep van der velden
c8d831dc67 Fixed it 2018-10-10 21:41:09 +02:00
variableundefined
62fceba06a Merge pull request #9765 from Agameofscones/cupsnstuff 
Hot Drink Sprites QOL
 2018-10-11 03:24:29 +08:00
variableundefined
14096bfc36 Merge pull request #9720 from SamHPurp/dirt-smoothing 
New dirt sprites & dirt smoothing
 2018-10-11 02:18:41 +08:00
variableundefined
3fccecf482 Merge pull request #9803 from Birdtalon/ironsand 
Fixes missing ironsand sprites
 2018-10-11 01:55:11 +08:00
Purpose
9ee4347965 conflicts? apparently? 2018-10-10 18:53:22 +01:00
Gwydion Brain
57debc2eb8 Merge branch 'master' into thatdanguy23_fluff_t2 2018-10-10 10:52:04 -07:00
variableundefined
03deae3a31 Merge pull request #9804 from Birdtalon/tpbug 
Fixes mulebot teleportation bug
 2018-10-11 01:44:11 +08:00
Birdtalon
83f906ad21 nulls load properly 2018-10-10 18:11:34 +01:00
Birdtalon
e9ac0a155b moves ironsand sprites into their own dmi and points the ironsand class at it 2018-10-10 16:40:04 +01:00
variableundefined
021f55539f Merge pull request #9776 from tigercat2000/hover_indicator_inventory 
SSOverlays & Hover Inventory Indicator
 2018-10-10 22:19:26 +08:00
variableundefined
81707be798 Merge pull request #9792 from Ty-Omaha/SIREN-FIX 
Fixes the Ambulance
 2018-10-10 21:22:08 +08:00
variableundefined
b40ab8fdce Merge pull request #9801 from Citinited/holopad-fix 
Stops you being able to call yourself with a holopad
 2018-10-10 17:03:18 +08:00
variableundefined
3350cdd27f Merge pull request #9789 from Birdtalon/runtime 
Fixes runtime in tickets.dm
 2018-10-10 17:02:25 +08:00
variableundefined
2dd980e6ae Merge pull request #9797 from Citinited/airlock-icons-fix 
Airlocks properly update their icon_state when open/closed
 2018-10-10 16:29:47 +08:00
tigercat2000
39c6b5d1e7 Spacing 2018-10-09 20:37:46 -07:00