85c6997584
Merge remote-tracking branch 'upstream/master' into plasmamen-rework
...
# Conflicts:
# code/modules/mob/living/carbon/human/update_icons.dm
# icons/obj/device.dmi
# paradise.dme
2019-08-25 16:51:21 -04:00
3667557b60
More Lavaland Updates: Primal and Bayonets
2019-08-19 20:02:53 -04:00
39c9e9abde
Reworks Plasmamen
2019-08-11 18:56:32 -04:00
9eff8a8663
Merge pull request #11696 from Markolie/shuttlechairs
...
Add shuttle chairs (and fix newlines on all maps)
2019-08-11 16:32:14 +08:00
673d1c9f78
Merge pull request #11611 from farie82/blindfold-craftable
...
Blindfolds are now craftable from 3 cloth
2019-08-11 15:00:34 +08:00
2ae1fc7ac2
Merge branch 'master' of https://github.com/ParadiseSS13/Paradise into shuttlechairs
...
# Conflicts:
# icons/obj/chairs.dmi
2019-08-09 23:41:07 +02:00
14e8022daf
Merge branch 'master' of https://github.com/ParadiseSS13/Paradise into portalfix
...
# Conflicts:
# code/game/objects/effects/step_triggers.dm
2019-08-09 23:38:49 +02:00
f1899f0050
Merge pull request #11697 from Markolie/tribalhealing
...
Add tribal splints, ash walker tweaks and Lavaland tweaks
2019-08-09 17:22:22 -04:00
8c8950bf07
Merge branch 'master' of https://github.com/ParadiseSS13/Paradise into shuttlechairs
...
# Conflicts:
# _maps/map_files/cyberiad/cyberiad.dmm
2019-07-15 20:37:44 +02:00
88fa0d27df
Merge branch 'master' of https://github.com/ParadiseSS13/Paradise into ruinsport
...
# Conflicts:
# paradise.dme
2019-07-15 20:30:54 +02:00
fd579015b1
Portal fixes - adds oldloc to Crossed()
2019-07-15 20:16:17 +02:00
e42e1af87a
Merge pull request #11634 from Markolie/laborstacker
...
Updates the prison labor point system
2019-07-09 18:21:58 +08:00
e0a21759fb
Add tribal splints
2019-06-07 04:06:12 +02:00
bc12891f02
Move shuttle seat out of comfy chairs category
2019-06-07 03:59:45 +02:00
f56854292a
Add shuttle chairs (and fix newlines on all maps)
2019-06-07 03:39:24 +02:00
ba3f65049d
Port over remaining Lavaland ruins
2019-06-07 01:19:55 +02:00
1988ae34d8
Merge pull request #11643 from Markolie/turfs
...
Lavaland fixes, continued
2019-06-02 17:58:56 -07:00
d94906e19a
Merge pull request #11656 from Markolie/multiplier
...
Fixes an exploit with the sheet multiplier
2019-06-02 15:52:37 -07:00
c6e6c6cefd
Even better water handling
2019-06-03 00:31:03 +02:00
8a70f6aa65
Sheet multiplier exploit fix
2019-06-03 00:16:39 +02:00
fd8a9e4909
Water handling improvement
2019-06-03 00:06:29 +02:00
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
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
4446664997
Update labor stacker
2019-05-31 19:37:25 +02:00
f07bd98a2a
Blindfolds are now craftable from 3 cloth
2019-05-28 19:43:01 +02:00
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
1e363bfb88
Craftable patch pack
2019-04-30 19:51:01 +02:00
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
5d508cd984
Stack QOL update
2019-04-21 13:57:30 +02:00
c878f8e36e
Lavaland code review fixes - also integrates flyswatter and cat toy
2019-04-20 00:24:58 +02:00
7eb4277a01
MORE UPDATES!
2019-04-03 20:29:16 +01:00
9f5b3fc796
updates
2019-04-02 20:26:23 +01:00
1689e46f1e
Added Syndicate base and ported over turf decals
2019-03-31 20:26:02 +02:00
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
f92be2c67d
Add Beach biodome ruin and other fixes
2019-03-30 22:48:11 +01:00
fb337f2825
Port over Lavaland mobs and turfs (not finished)
2019-03-29 23:45:36 +01:00
277722508a
[Goonchem] Reagent Temperature
2019-03-18 20:06:15 -04:00
e7f8cca24a
The World Can Burn For All I Care
2019-03-03 11:06:31 -05:00
f133be6760
Fixes Stacks--Again
2019-02-27 09:29:29 -05:00
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
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
d3448cf287
Merge branch 'master' of https://github.com/ParadiseSS13/Paradise into EXTERMINATUSPARTONE
2019-01-29 17:42:39 -05:00
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
6741238ef1
Stop the animals!
2019-01-23 22:34:51 +02:00
d631479031
Reduce the cost of bomb frames to 3 plasteel
2019-01-22 00:41:05 +00:00
8175d67b2e
honk_bot from V2
...
Originaly from PULL
https://github.com/ParadiseSS13/Paradise/pull/10656
2019-01-21 12:31:47 -03:00
b812736517
Merge branch 'master' of https://github.com/ParadiseSS13/Paradise into EXTERMINATUSPARTONE
2019-01-19 23:35:15 -05:00
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
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
fbd31bd46a
Merge branch 'master' into emitter-reflectors
2018-12-23 23:26:47 +00:00
Fox McCloud