Artorp
e1eb2b9a1d
Updated m_amt and g_amt to match their design
2015-02-17 18:52:31 +01:00
Tigercat2000
d23d8af778
Port of freeze mob verb from NSS Pheonix
2015-02-17 18:04:31 +01:00
ZomgPonies
575beed24e
Made sure +MENTOR didn't see global LOOC
2015-02-17 11:52:39 -05:00
Artorp
b89385144a
Added queue functionality to the autolathe
2015-02-17 17:27:42 +01:00
Markolie
9b61724f01
Let robots put people on optables
2015-02-17 17:13:42 +01:00
ZomgPonies
854e2b91c3
Forgot to update adminwho
2015-02-17 02:33:22 -05:00
Markolie
f5e2d82953
(Plasma decal already fixed) - Merge branch 'master' of https://github.com/ParadiseSS13/Paradise
...
Conflicts:
code/game/machinery/atmoalter/canister.dm
2015-02-17 02:12:22 +01:00
Markolie
be00a555fa
Fix plasma decal, mapfix
2015-02-17 02:07:31 +01:00
Markolie
d7f17f6eba
Bug fixes, give roboticist toolbelt, AI recall shuttle option
2015-02-17 01:04:04 +01:00
Markolie
4d8481f83a
Merge surgical borgs and crisis borgs
2015-02-16 22:47:55 +01:00
Fox-McCloud
a03879d83f
Sound Updates
2015-02-16 16:29:43 -05:00
Markolie
9f40758ce5
Move hacking screen to the top when panel is unscrewed
2015-02-16 22:02:41 +01:00
Markolie
8726bad5b0
Z-level check refactor
2015-02-16 20:33:28 +01:00
Mark van Alphen
5dad7fa58d
Merge pull request #316 from ZomgPonies/rev
...
Rev Tuning
2015-02-16 19:27:04 +01:00
ZomgPonies
2894dbc266
Removed IAA from target list.
2015-02-16 13:09:47 -05:00
Markolie
ad167dc541
Announcement system overhaul, crew monitor system overhaul, add portable crew monitor
2015-02-16 19:03:29 +01:00
Mark van Alphen
3bc771b15b
Merge pull request #314 from Fox-McCloud/Cargo
...
Cargo
2015-02-16 06:52:16 +01:00
ZomgPonies
1bed62cf75
Modifies the wishgranter
2015-02-15 10:27:22 -05:00
ZomgPonies
3193e06afc
Adds extra targets if there's more than 40 readied players at roundstart.
2015-02-15 09:26:16 -05:00
Artorp
839ac9e026
Moves plasma decal from N2 tank to plasma tank
2015-02-15 09:54:07 +01:00
Fox-McCloud
1fdd281f19
Critter Crate Fix
2015-02-15 03:19:43 -05:00
Fox-McCloud
dbf4c84953
Merge pull request #311 from Markolie/master
...
Ziptie restraint examine, fax panel adjustment
2015-02-14 23:23:35 -05:00
Fox-McCloud
1e4d1df880
Merge remote-tracking branch 'upstream/master' into Cargo
2015-02-14 22:02:39 -05:00
Fox-McCloud
0de7e1035c
Cargo Supplies
2015-02-14 21:21:09 -05:00
Markolie
0792a40379
Add zipties to secvender, replace box of handcuffs in warden's locker with zipties box
2015-02-14 22:31:31 +01:00
Markolie
ba63ce5092
Add pay button to vendors
2015-02-14 19:07:00 +01:00
ZomgPonies
d3256723c4
Merge pull request #310 from Markolie/master
...
Fix viro maint access, other fixes
2015-02-14 11:26:22 -05:00
Markolie
f019d32fbe
Fix MegaSeed vendor seed names on roundstart
2015-02-14 16:55:17 +01:00
ZomgPonies
091d2c8348
Merge pull request #307 from Markolie/master
...
Fix atmos meter, emag refactor, vending machine update, UI reworks, admin fax overhaul, other fixes
2015-02-14 09:17:52 -05:00
Markolie
165f8118af
Add box of zipties, give zipties to nuke ops and Vox raiders
2015-02-14 14:54:32 +01:00
Markolie
47e4126277
Add send time to fax, fix nest issue
2015-02-14 04:56:09 +01:00
Markolie
9fed8135d4
Handcuff refactor, IV drip fix
2015-02-14 04:35:32 +01:00
Markolie
9dd99ba240
Stop AI's from detaching IV drips, Ultimate Chimera's alien AI fix
2015-02-14 00:18:41 +01:00
Tigercat2000
113fd94e88
Fix dressers to actually work. [BUGFIX]
2015-02-13 23:04:04 +01:00
Markolie
f180812abb
Ensure interface updates on emag
2015-02-13 17:14:20 +01:00
Markolie
c8acddaad3
Windowdoor emag fix
2015-02-13 17:12:21 +01:00
Markolie
0b937d5ace
Emag refactor
2015-02-13 16:59:20 +01:00
Markolie
71319538df
Vending machine overhaul, teleporter area fix, add events to status tab
2015-02-13 15:27:42 +01:00
Markolie
91def7da63
Fix meter
2015-02-13 14:25:54 +01:00
Fox-McCloud
66d3bfccf6
Merge pull request #304 from Markolie/master
...
Get_candidates simplification, antag age adjustment, fixes
2015-02-12 20:26:02 -05:00
Markolie
8144cf030c
Fix toy exploit
2015-02-13 01:49:27 +01:00
DZD
723dc2ad98
ABSTRACT flag addition & handling
...
- Adds ABSTRACT flag to relevant items, removes abstract var.
- Adds checks for ABSTRACT where relevant.
- Also removes extra define of golem gas mask.
- Adds NODROP to changeling mutations so I don't have to do that later.
2015-02-12 18:49:26 -05:00
Mark van Alphen
6101becbe4
Merge pull request #305 from FalseIncarnate/master
...
[Bug-Fix] Re-adds missing seeds, floodlight wrenching
2015-02-13 00:24:41 +01:00
FalseIncarnate
86d069eb31
Floodlight Wrenching
...
Allows floodlights to be wrenched into place like the carts, to avoid
accidentally pushing them away.
2015-02-12 18:01:57 -05:00
FalseIncarnate
47b6c867c9
Re-adds Seeds to Vending Machine
...
Re-adds Tobacco, Coffee Arabica, and Tea Aspera seeds to the seed
vendors. They were accidentally removed in the Econ revert.
2015-02-12 18:00:59 -05:00
Markolie
6938ad7edc
False rwalls now smooth with regular walls and vice versa
2015-02-12 23:37:54 +01:00
DZD
a4cda9287f
Merge with upstream/master
2015-02-12 16:43:01 -05:00
Mark van Alphen
8b35ce23ae
Merge pull request #300 from Artorp/cryoUI
...
Added UI to cryo autoeject feature
2015-02-12 21:38:29 +01:00
Mark van Alphen
747ef23162
Merge pull request #299 from Artorp/canisterUI
...
Canister label system UI
2015-02-12 21:37:10 +01:00
Artorp
dfe10dcaa8
Decals scalability, templ exploit prevention
...
- Moved from multiple if() to for(), adding scalability to decals
- added is_a_decal() to prevent possible template mod exploits
2015-02-12 20:58:41 +01:00
