cyberpresidentvanellope/Paradise
1
0
Fork 0
mirror of https://github.com/ParadiseSS13/Paradise.git synced 2025-12-27 18:51:53 +00:00
Code Issues Packages Projects Releases Wiki Activity
44,949 Commits 26 Branches 2 Tags
d02165e0f94de2c4a9399a8699cc355da4f8a329
Commit Graph

453 Commits

Author SHA1 Message Date
Mark van Alphen
ba3f65049d Port over remaining Lavaland ruins 2019-06-07 01:19:55 +02:00
Crazy Lemon
1988ae34d8 Merge pull request #11643 from Markolie/turfs 
Lavaland fixes, continued
 2019-06-02 17:58:56 -07:00
Crazy Lemon
d94906e19a Merge pull request #11656 from Markolie/multiplier 
Fixes an exploit with the sheet multiplier
 2019-06-02 15:52:37 -07:00
Mark van Alphen
c6e6c6cefd Even better water handling 2019-06-03 00:31:03 +02:00
Mark van Alphen
8a70f6aa65 Sheet multiplier exploit fix 2019-06-03 00:16:39 +02:00
Mark van Alphen
fd8a9e4909 Water handling improvement 2019-06-03 00:06:29 +02:00
Mark van Alphen
697bb8eee5 More Lavaland fixes: 
- Air alarm computers will no longer display alarms that can't be remote controlled
- Survival capsules now have a NanoMed
- Fixed the disk compartmentalizer not having a sprite when something is put in
- Fixed the drying rack not having a sprite when something is put in
- Turned water bottles into glass containers so they have more functionality
- Hairless hide can now be made wet using water
- Reagents in glass containers can now be fed to others
 2019-06-02 23:29:50 +02:00
Mark van Alphen
c9e87f6593 Add more explosive power to Syndicate base, add species specific sprites for explorer equipment (thanks Ionward), fix Drake explosive sound, clarify ash walker/syndicate base personnel flavor text 2019-06-01 21:17:17 +02:00
Mark van Alphen
35b1cee88b Merge branch 'master' of https://github.com/ParadiseSS13/Paradise into turfs 
# Conflicts:
#	icons/obj/toy.dmi
 2019-05-03 18:31:45 +02:00
Arkatos1
1e363bfb88 Craftable patch pack 2019-04-30 19:51:01 +02:00
Mark van Alphen
ba0f6abb02 Merge branch 'master' of https://github.com/ParadiseSS13/Paradise into turfs 
# Conflicts:
#	code/game/objects/items.dm
#	code/modules/power/cable.dm
#	icons/mob/inhands/items_lefthand.dmi
#	icons/mob/inhands/items_righthand.dmi
#	icons/obj/lighting.dmi
#	paradise.dme
 2019-04-30 19:26:17 +02:00
Arkatos1
5d508cd984 Stack QOL update 2019-04-21 13:57:30 +02:00
Mark van Alphen
c878f8e36e Lavaland code review fixes - also integrates flyswatter and cat toy 2019-04-20 00:24:58 +02:00
CornMyCob
7eb4277a01 MORE UPDATES! 2019-04-03 20:29:16 +01:00
CornMyCob
9f5b3fc796 updates 2019-04-02 20:26:23 +01:00
Mark van Alphen
1689e46f1e Added Syndicate base and ported over turf decals 2019-03-31 20:26:02 +02:00
Mark van Alphen
45a066c7d1 Merge branch 'master' of https://github.com/ParadiseSS13/Paradise into turfs 
# Conflicts:
#	code/modules/food_and_drinks/recipes/recipes_grill.dm
 2019-03-30 22:55:09 +01:00
Mark van Alphen
f92be2c67d Add Beach biodome ruin and other fixes 2019-03-30 22:48:11 +01:00
Mark van Alphen
fb337f2825 Port over Lavaland mobs and turfs (not finished) 2019-03-29 23:45:36 +01:00
Fox McCloud
277722508a [Goonchem] Reagent Temperature 2019-03-18 20:06:15 -04:00
Fox McCloud
e7f8cca24a The World Can Burn For All I Care 2019-03-03 11:06:31 -05:00
Fox McCloud
f133be6760 Fixes Stacks--Again 2019-02-27 09:29:29 -05:00
datlo
38c64a953e Golem tweaks 
Shuttle interior walls and floors are now fully simulated and can be
deconstructed/built upon. Exterior is still shuttle walls
Increased the cost of RND boards to 2000
Golems can no longer activate robotic brains or have their brain put in
an MMI
Replaced one welding fuel tank by a chem master 3000
 2019-02-12 02:07:01 +00:00
datlo
74a3631741 compilin and mostly workin 
has runtimes due to body color
need to wrap up commented procs
 2019-02-03 06:40:50 +00:00
Aurorablade
d3448cf287 Merge branch 'master' of https://github.com/ParadiseSS13/Paradise into EXTERMINATUSPARTONE 2019-01-29 17:42:39 -05:00
variableundefined
13629ba71b Merge pull request #10699 from datlo/cheapbombframe 
Reduce the cost of bomb frames to 3 plasteel
 2019-01-24 18:15:02 +08:00
Dovixx
6741238ef1 Stop the animals! 2019-01-23 22:34:51 +02:00
datlo
d631479031 Reduce the cost of bomb frames to 3 plasteel 2019-01-22 00:41:05 +00:00
Nicaragua
8175d67b2e honk_bot from V2 
Originaly from PULL

https://github.com/ParadiseSS13/Paradise/pull/10656
 2019-01-21 12:31:47 -03:00
Aurorablade
b812736517 Merge branch 'master' of https://github.com/ParadiseSS13/Paradise into EXTERMINATUSPARTONE 2019-01-19 23:35:15 -05:00
variableundefined
b3d27c7202 Merge pull request #10584 from datlo/removeuplinkmanagement 
Replaces uplink management by automated sharing + various misc outfit changes
 2019-01-06 16:14:59 +08:00
datlo
61c0f71cce Replaces uplink management by automated sharing 
Various admin outfits changes
Add internal box to honk brand infiltration kit
Add fifty TC stack buyable by nukies
Add subtypes of uplinks : Traitor, Nuclear, SIT, SST, Admin, only
checked by auto sharing for now
 2019-01-03 16:29:31 +00:00
AffectedArc07
fbd31bd46a Merge branch 'master' into emitter-reflectors 2018-12-23 23:26:47 +00:00
AffectedArc07
3ba1837c9f Adds reflectors 2018-12-23 23:07:01 +00:00
Aurorablade
86d2a1634c Casing correction 1 2018-12-17 00:07:37 -05:00
Darkmight9
dd5c18a8b4 Gives nanopaste overheal 2018-12-03 01:03:47 -05:00
Darkmight9
50dbd49530 This, hopefully, gives overheal to nanopaste or at least can be a staging point. This is my fisr time coding so advice and impute is aprecated. 2018-11-21 01:20:32 -05:00
lass9030
c6af6f56f3 sheet hand icons from existing sprites 2018-11-09 15:21:45 +01:00
tigercat2000
97461b3f3d Merge pull request #10078 from variableundefined/FermentationBarrel 
[READY] Port Fel's fermentation barrel from tg
 2018-11-07 23:09:08 -08:00
TDSSS
a89cf91f82 now with 100% less snowflake 2018-11-06 11:42:01 +01:00
variableundefined
c2f92bec5e Make fermentation barrel a stack recipe, fixes koibean and soybean being OP 2018-11-03 21:39:38 +08:00
Unknown
1cd8d2f98f Surgical Trays 
Adds Surgical Trays
 2018-10-22 17:37:51 -04:00
Mark Mak
4bc1a1c1ef Merge pull request #9363 from MarsM0nd/Refactor_UID 
Href refactor: macros and playerpanel
 2018-10-19 07:46:42 +08:00
variableundefined
b097b06b72 CtrlShiftClick for stack 2018-10-13 23:04:50 +08:00
Mars
984339ce42 Merge-conflict fix + check for null rather than type. 2018-10-12 18:59:54 +02:00
variableundefined
108ebfed3a Formatting improvement 2018-10-12 07:57:58 +08:00
Mars
d9b60a7bfb Fix merge conflict 2018-10-09 09:41:37 +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
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
Purpose
c82cd93a89 Merge branch 'master' into Refactors-beds-stools-chairs 2018-09-29 15:36:27 +01:00