 variableundefined
|
ae70cbfe41
|
Merge pull request #11606 from Markolie/ghostqol
Observer/hud improvements and fixes
|
2019-08-11 16:23:23 +08:00 |
|
|
variableundefined
|
673d1c9f78
|
Merge pull request #11611 from farie82/blindfold-craftable
Blindfolds are now craftable from 3 cloth
|
2019-08-11 15:00:34 +08:00 |
|
|
Fox McCloud
|
6c8fe1d506
|
Merge pull request #11864 from Markolie/portalfix
Portal fix
|
2019-08-10 23:24:58 -04:00 |
|
|
Fox McCloud
|
ee0447dad6
|
Major Lavaland Update
|
2019-08-10 22:36:55 -04:00 |
|
|
Crazy Lemon
|
ae27e39dec
|
Merge pull request #11976 from Fox-McCloud/fix-dual-swords
Fixes Sharpening Toy Swords
|
2019-08-09 17:56:48 -06:00 |
|
|
Mark van Alphen
|
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 |
|
|
Mark van Alphen
|
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 |
|
|
Fox McCloud
|
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 |
|
|
Fox McCloud
|
fdfbb8fd93
|
Fixes Sharpening Toy Swords
|
2019-08-09 16:36:04 -04:00 |
|
|
farie82
|
b4ed42155b
|
return
|
2019-08-07 08:43:32 +02:00 |
|
|
Couls
|
70c9c4c932
|
Merge remote-tracking branch 'upstream/master' into baseball-deflects
|
2019-08-04 21:19:38 -04:00 |
|
|
Couls
|
5d18578aa5
|
Merge remote-tracking branch 'upstream/master' into blood-changes
|
2019-08-04 21:14:30 -04:00 |
|
|
Couls
|
268881de5c
|
Merge remote-tracking branch 'upstream/master' into constructable-rechargers
|
2019-08-04 21:11:21 -04:00 |
|
|
Couls
|
6ee8c0d96f
|
Merge remote-tracking branch 'upstream/master' into zombies
|
2019-08-04 21:05:10 -04:00 |
|
|
Couls
|
75ed8566f5
|
Merge remote-tracking branch 'upstream/master' into on-hit-effects
|
2019-08-04 21:00:57 -04:00 |
|
|
FreeStylaLT
|
469dba4067
|
Minor optimization and comments
|
2019-08-04 01:02:30 +03:00 |
|
|
FreeStylaLT
|
2a0a0769b0
|
spacing and fixes the spam-self-attack exploit with the picker
|
2019-08-02 18:19:56 +03:00 |
|
|
FreeStylaLT
|
7153552297
|
Magic strings to defines, adds a GLOB list for the beacons
|
2019-08-02 17:40:37 +03:00 |
|
|
FreeStylaLT
|
e0166fa7be
|
and fixes the picker emitting the item / mob destruction messages
|
2019-08-02 16:12:10 +03:00 |
|
|
FreeStylaLT
|
0bc40f478e
|
and fixes cancel not working
|
2019-08-02 16:04:31 +03:00 |
|
|
FreeStylaLT
|
77ff8394b5
|
removes a redundant switch
|
2019-08-02 15:57:44 +03:00 |
|
|
FreeStylaLT
|
de5b2f7d6e
|
adds the actual .dm oops
|
2019-08-02 14:43:26 +03:00 |
|
|
FreeStylaLT
|
c190c814ad
|
adds the enginepicker
|
2019-08-02 14:36:31 +03:00 |
|
|
joep van der velden
|
0ab00bb9ff
|
More refactor + wrong item used fix
|
2019-07-29 21:18:42 +02:00 |
|
|
joep van der velden
|
ab94782f56
|
Fire axe code refactor + tooltip
|
2019-07-29 21:07:12 +02:00 |
|
|
joep van der velden
|
47a63e3a51
|
Added a few tips and fixed a bug
|
2019-07-29 01:42:51 +02:00 |
|
|
joep van der velden
|
b46e970327
|
Better fix now. Use 15 wires using use()
|
2019-07-29 00:31:22 +02:00 |
|
|
joep van der velden
|
2bddeb7fde
|
Borgs can't rig crates anymore with cable coil
|
2019-07-29 00:08:35 +02:00 |
|
|
joep van der velden
|
402d1ef131
|
No drop items now lose their nodrop if dropped
|
2019-07-29 00:03:18 +02:00 |
|
|
Ty-Omaha
|
f5134a417d
|
door remote logs
|
2019-07-28 17:49:04 -04:00 |
|
|
Couls
|
5427c5267c
|
Merge branch 'master' into unrestricted-airlocks
|
2019-07-15 18:29:31 -04:00 |
|
|
Mark van Alphen
|
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 |
|
|
Mark van Alphen
|
88fa0d27df
|
Merge branch 'master' of https://github.com/ParadiseSS13/Paradise into ruinsport
# Conflicts:
# paradise.dme
|
2019-07-15 20:30:54 +02:00 |
|
|
Mark van Alphen
|
fd579015b1
|
Portal fixes - adds oldloc to Crossed()
|
2019-07-15 20:16:17 +02:00 |
|
|
tayyyyyyy
|
57c700a814
|
Sanitize all inputs
|
2019-07-14 09:35:12 -07:00 |
|
|
Arkatos1
|
47b447619a
|
Merge https://github.com/ParadiseSS13/Paradise into pillbottle
|
2019-07-12 19:40:59 +02:00 |
|
|
Dovixx
|
404bfe3768
|
Update chairs.dm
|
2019-07-12 18:00:01 +03:00 |
|
|
variableundefined
|
36736277a1
|
Merge pull request #11358 from Couls/diagonal-movement
[Ready for Testmerge] Implement Diagonal Movement
|
2019-07-12 17:12:57 +08:00 |
|
|
Couls
|
bf161edfeb
|
grammar
|
2019-07-11 19:36:25 -04:00 |
|
|
Kyep
|
fd389810f2
|
medals in lockers
|
2019-07-10 20:13:14 -07:00 |
|
|
Couls
|
a8a9e8e022
|
Baseball!
|
2019-07-10 21:12:35 -04:00 |
|
|
variableundefined
|
e42e1af87a
|
Merge pull request #11634 from Markolie/laborstacker
Updates the prison labor point system
|
2019-07-09 18:21:58 +08:00 |
|
|
Mark van Alphen
|
d03f4dcafb
|
Merge branch 'master' of https://github.com/ParadiseSS13/Paradise into ruinsport
# Conflicts:
# paradise.dme
|
2019-07-08 19:36:30 +02:00 |
|
|
Couls
|
cee64d5c37
|
Merge remote-tracking branch 'upstream/master' into diagonal-movement
|
2019-07-08 10:13:15 -04:00 |
|
|
variableundefined
|
742bc62c8b
|
Merge pull request #11544 from Arkatos1/recharger
Rechargers now show their contents and charge status on examine
|
2019-07-08 20:18:36 +08:00 |
|
|
variableundefined
|
82a52969e2
|
Merge pull request #11525 from Citinited/rpd-radial-menu
Adds a mini-radial menu to the RPD
|
2019-07-08 17:33:46 +08:00 |
|
|
Couls
|
a7b4e0b9ef
|
Merge remote-tracking branch 'upstream/master' into diagonal-movement
|
2019-07-07 22:17:19 -04:00 |
|
|
variableundefined
|
93d9cd4e08
|
Merge pull request #11787 from JKnutson101/lattice_catwalk_fix
Fixed a bug that prevented Catwalks and Lattice from returning materials
|
2019-07-07 22:10:08 +08:00 |
|
|
Couls
|
18a452b536
|
use initialize() and fixes
|
2019-07-07 05:01:42 -04:00 |
|
|
Couls
|
dfc5c4fca3
|
only call update_icon when entering/exiting from a new direction
|
2019-07-07 03:30:48 -04:00 |
|