Walter0o
a36d0b3ff4
part 3 of fixing #5521
2014-07-10 17:04:27 +02:00
Walter0o
6bff77c0ba
part 2 of fixing #5521
2014-07-10 16:55:38 +02:00
Walter0o
323ced2803
part 1 of fixing #5521
2014-07-10 16:55:23 +02:00
Walter0o
cd0c49ab81
another laptop verb range fix
2014-07-10 16:31:29 +02:00
Walter0o
e1a8e95081
fixes rangecheck on laptop verbs
2014-07-10 16:24:38 +02:00
Walter0o
5b3f7b30c0
fixes #5548
...
missing range check for Alt click on laptops
2014-07-10 12:50:20 +02:00
Boop
8c3f6f2226
fix a world << THING
...
(help)
2014-07-05 20:28:08 +01:00
Zuhayr
b670cdcdf1
Fixes #5483
2014-07-04 17:48:12 +09:30
Zuhayr
b9c6b7b77d
Merge with master.
2014-07-02 06:59:11 +09:30
Zuhayr
34f7ba30d5
Fixes guest terminals only allowing 29 minute passes.
2014-07-02 06:46:42 +09:30
Zuhayr
a55b447100
Fixes #5450
2014-07-02 05:37:26 +09:30
PsiOmega
332cf214a2
Partially corrects #5438
...
Central atmospherics computer now expects atmos access, rather than CE access.
2014-07-01 20:48:31 +02:00
Mloc-Argent
6630e4838e
Merge remote-tracking branch 'upstream/master' into dev-freeze
...
Signed-off-by: Mloc-Argent <colmohici@gmail.com >
Conflicts:
code/game/machinery/alarm.dm
2014-06-30 23:44:46 +01:00
Chinsky
b018e9e150
Fixed #5374
...
Also added cancellation buttons here and there.
Prevented an exploit, resulting in ability to issue same passes with different ID, even if it doesn't have those accesses.
2014-06-30 16:11:42 +04:00
mwerezak
909e8a4e95
Fixes #4688
...
Or attempts to at least.
2014-06-28 17:42:27 -04:00
DJSnapshot
0ac199f92d
shuttle controller fix
2014-06-23 15:15:53 -07:00
DJSnapshot
7a3bee3823
Merge branch 'dev' of https://github.com/Baystation12/Baystation12 into laptop
2014-06-23 15:06:02 -07:00
DJSnapshot
c007b013d0
Clicking the magnetic card slot option on the desktop will eject all cards. No more eating cards!
2014-06-23 14:43:43 -07:00
Mloc-Argent
a33cb7272b
Merge remote-tracking branch 'upstream/master' into dev
2014-06-23 20:57:47 +01:00
DJSnapshot
db6a403c2f
uses get_turf instead of get_turf_loc now
2014-06-23 02:09:17 -07:00
DJSnapshot
d8ef1647a7
Forgot to commit welcome.dm
2014-06-23 01:54:03 -07:00
DJSnapshot
488c4f4b84
Merge branch 'dev' of https://github.com/Baystation12/Baystation12 into laptop
...
Conflicts:
code/setup.dm
2014-06-23 00:25:39 -07:00
DJSnapshot
e96b682cf4
laptop vendor!
2014-06-22 23:45:38 -07:00
DJSnapshot
2025e84b67
fixes for potential runtimes.
2014-06-22 23:42:47 -07:00
DJSnapshot
aa27bdc64c
laptop vending part 1. and more cleanup.
2014-06-22 17:19:40 -07:00
DJSnapshot
41362280f3
lowercase ntos by request of mloc + updates to background.
2014-06-22 03:46:36 -07:00
DJSnapshot
7a5a3d47ae
Fixed up security, medical, card, and crew. Made Computer 3 actually do what it's supposed to do.
2014-06-22 03:31:06 -07:00
DJSnapshot
9de9dab362
Initial commit of Computer 3 from Paradise, along with a bunch of fixes.
2014-06-22 02:08:42 -07:00
mwerezak
37e63dfcb0
Fixes FEA temperature_expose() being used...
...
...instead of ZAS fire_act().
2014-06-22 00:13:22 -04:00
Mloc-Argent
dd7f0dac0e
Merge remote-tracking branch 'upstream/master' into dev
...
Signed-off-by: Mloc-Argent <colmohici@gmail.com >
Conflicts:
code/game/machinery/computer/card.dm
code/modules/mob/living/say.dm
2014-06-20 22:02:40 +01:00
Chinsky
78142a7cc2
Merge pull request #5276 from caelaislinn/xenoarchaeology
...
Xenoarchaeology
2014-06-20 14:41:25 +04:00
Cael Aislinn
6c46ceaf6d
Merge branch 'dev' of https://github.com/Baystation12/Baystation12 into xenoarchaeology
...
Conflicts:
icons/obj/hydroponics.dmi
manual merge of conflicted icon file
Signed-off-by: Cael Aislinn <cael_aislinn@yahoo.com.au >
2014-06-19 10:05:27 +10:00
Zuhayr
342bee81d4
Merge pull request #5284 from boopcat/happydrones
...
more fixes!
2014-06-18 08:58:00 +09:30
Boop
a903e400dd
Fixes #5088
...
also fixes more runtimes that mloc gave me
2014-06-17 20:35:48 +01:00
Chinsky
9e8b124037
ixes #5075
...
Mech fabricator redefined check access for no reason, let base proc handle it.
Adds span classes for messages guestpass console gives.
2014-06-17 18:25:39 +04:00
Chinsky
be95e54e43
Merge branch 'master' into dev
...
Conflicts:
code/defines/obj/weapon.dm
code/modules/mob/living/carbon/species.dm
code/modules/mob/living/silicon/say.dm
icons/mob/uniform.dmi
maps/tgstation2.dmm
2014-06-17 16:16:44 +04:00
mwerezak
1b33ca943d
Separates the sharp flag into edge and sharp
...
Now weapons can properly cause cuts without necessarily having a greater
chance to remove limbs.
Also separates is_sharp, has_edge, and can_puncture.
2014-06-15 20:25:39 -04:00
Zuhayr
136ccc347b
Merge with dev.
2014-06-12 01:14:40 +09:30
Zuhayr
4ee8f56c29
Merged master to dev, manually fixed merge issues in map, may be some left.
2014-06-11 18:11:41 +09:30
Zuhayr
c841db56b6
Merge branch 'mining' of https://github.com/Zuhayr/Baystation12 into dev
2014-06-11 09:24:28 +09:30
Zuhayr
9e7fe6d700
Rewrote autolathe, changed all m_amt and g_amt to a list called 'matter'. Updated RCD vars in view of this.
2014-06-11 01:14:38 +09:30
Hubblenaut
f12ee3f7b3
Fixes some printouts causing a runtime error when photocopied
2014-06-07 18:27:22 +02:00
Zuhayr
78918e4795
Entirely removed the Honker mech, other refs to bananium, adamantine and mythril.
2014-06-08 00:52:20 +09:30
Zuhayr
1e135f91af
Merge resolution with master.
2014-06-02 12:05:12 +09:30
Zuhayr
42ed91feda
Actually fixes #5100
2014-05-31 15:13:50 +09:30
Zuhayr
ed3a8ac44b
Fixes #5100
2014-05-31 15:11:08 +09:30
Mloc-Argent
ee2e68960a
Merge remote-tracking branch 'upstream/master' into dev-freeze
...
Signed-off-by: Mloc-Argent <colmohici@gmail.com >
Conflicts:
code/game/machinery/cloning.dm
code/modules/admin/admin_verbs.dm
2014-05-31 00:17:56 +01:00
Zuhayr
d9f728cff5
Fixes #5061
2014-05-28 16:57:15 +09:30
Ravensdale
abdadd35b4
Updates most used viable entries of t cet to Nyx
2014-05-26 15:58:16 -07:00
Mloc-Hibernia
e3a8d5eb43
Merge remote-tracking branch 'upstream/master' into dev
...
Signed-off-by: Mloc-Hibernia <colmohici@gmail.com >
Conflicts:
code/game/objects/effects/spawners/bombspawner.dm
2014-05-11 13:19:09 +00:00
