bddc7132c2
Merge https://github.com/ParadiseSS13/Paradise into pillbottle
2019-08-12 16:36:43 +02:00
f6505a6fd5
Merge pull request #11819 from Kyep/medals
...
Department Medals
2019-08-12 17:52:22 +08: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
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
b4ed42155b
return
2019-08-07 08:43:32 +02:00
268881de5c
Merge remote-tracking branch 'upstream/master' into constructable-rechargers
2019-08-04 21:11:21 -04:00
0ab00bb9ff
More refactor + wrong item used fix
2019-07-29 21:18:42 +02:00
ab94782f56
Fire axe code refactor + tooltip
2019-07-29 21:07:12 +02:00
b46e970327
Better fix now. Use 15 wires using use()
2019-07-29 00:31:22 +02:00
2bddeb7fde
Borgs can't rig crates anymore with cable coil
2019-07-29 00:08:35 +02:00
5427c5267c
Merge branch 'master' into unrestricted-airlocks
2019-07-15 18:29:31 -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
47b447619a
Merge https://github.com/ParadiseSS13/Paradise into pillbottle
2019-07-12 19:40:59 +02:00
404bfe3768
Update chairs.dm
2019-07-12 18:00:01 +03:00
fd389810f2
medals in lockers
2019-07-10 20:13:14 -07:00
d03f4dcafb
Merge branch 'master' of https://github.com/ParadiseSS13/Paradise into ruinsport
...
# Conflicts:
# paradise.dme
2019-07-08 19:36:30 +02:00
a7b4e0b9ef
Merge remote-tracking branch 'upstream/master' into diagonal-movement
2019-07-07 22:17:19 -04:00
25f68f2e41
Removed a line that prevented Catwalks and Lattice from returning materials
2019-07-04 16:17:32 -04:00
4c0c7aa750
can now build unrestricted airlocks
2019-07-01 21:44:16 -04:00
cf31a774a5
Rechargers can be built now
...
Rechargers now use capacitors as their stock parts and recharge faster depending on the quality of the recharger(may need balancing)
Can now also place smaller machinery on tables by clicking on the table while pulling them(microwaves and soda dispensers are some examples)
2019-07-01 01:19:17 -04:00
de9da04572
Standardized colors, finished change wrapper choosing and modified templates and their sizes
2019-06-30 19:46:13 +02:00
16a81d2527
Merge https://github.com/ParadiseSS13/Paradise into pillbottle
2019-06-30 16:09:38 +02:00
d33d018e62
Finished colors for other prespawned pillbottles, new colors, finished template for changing wrappers in chemmaster
2019-06-30 16:08:33 +02:00
e3a19841d9
Merge remote-tracking branch 'upstream/master' into diagonal-movement
2019-06-22 03:54:43 -04:00
f56854292a
Add shuttle chairs (and fix newlines on all maps)
2019-06-07 03:39:24 +02:00
d02165e0f9
Ruin fixes
2019-06-07 02:03:19 +02:00
ba3f65049d
Port over remaining Lavaland ruins
2019-06-07 01:19:55 +02:00
94eb652f15
Fix alarms triggering on non-contact levels, spectral blade ghost fix, assigning outfits runtime fix
2019-06-03 17:39:23 +02:00
5979166f54
Merge remote-tracking branch 'upstream/master' into diagonal-movement
2019-06-02 21:59:58 -04:00
fd8a9e4909
Water handling improvement
2019-06-03 00:06:29 +02:00
fe68c74466
Merge branch 'master' into diagonal-movement
2019-05-22 14:24:54 -04:00
0f98a95666
Merge branch 'master' of https://github.com/ParadiseSS13/Paradise into turfs
...
# Conflicts:
# icons/mob/actions/actions.dmi
# paradise.dme
2019-05-13 22:14:38 +02:00
531201fab4
Merge branch 'master' into hooks-part4
2019-05-08 22:21:12 +01:00
2618def9a1
Merge branch 'master' of https://github.com/ParadiseSS13/Paradise into turfs
...
# Conflicts:
# _maps/map_files/Delta/delta.dmm
# _maps/map_files/MetaStation/MetaStation.v41A.II.dmm
# _maps/map_files/MetaStation/z4.dmm
# _maps/map_files/RandomRuins/SpaceRuins/derelict5.dmm
# _maps/map_files/RandomRuins/SpaceRuins/spacebar.dmm
# _maps/map_files/RandomZLevels/spacebattle.dmm
# _maps/map_files/cyberiad/cyberiad.dmm
# _maps/map_files/cyberiad/z4.dmm
# _maps/map_files/cyberiad/z6.dmm
# _maps/map_files/generic/z5.dmm
# code/__DEFINES/misc.dm
# code/__HELPERS/unsorted.dm
# code/game/objects/structures/lattice.dm
# code/game/turfs/space/space.dm
# code/modules/mob/mob.dm
# code/modules/ruins/ruin_areas.dm
# paradise.dme
2019-05-08 21:40:35 +02:00
79815eb042
Merge pull request #11357 from Markolie/lighting
...
Lighting system update
2019-05-08 00:27:16 -04:00
014d803eba
Merge branch 'master' into hooks-part4
2019-05-07 21:22:59 +01:00
51998efe56
Fixes #2
2019-05-07 18:01:11 +01:00
19d8efef68
Morgue Updating [Hooks P4]
2019-05-06 10:08:28 +01:00
130b5ef694
Fox fixes. Foxes?
2019-05-06 08:51:44 +01:00
7fb7cdc57f
Chair plane fix (and maybe fixes the disappearing humans, too)
2019-05-06 03:52:01 +02:00
f2bcd204bc
Fixes captains displaycase [Hooks P3]
2019-05-05 22:31:24 +01:00
fb619648a9
Resolve conflicts
2019-05-03 22:28:04 -04:00
bbeb07abd2
More lighting fixes
2019-05-04 03:06:10 +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
d646ab0934
Merge branch 'master' of https://github.com/ParadiseSS13/Paradise into lighting
...
# Conflicts:
# code/game/area/Space Station 13 areas.dm
2019-05-03 18:30:07 +02:00
0d81c2da7c
Adds Pig Crate
2019-05-01 14:19:43 -05: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
Arkatos1