Commit Graph

14991 Commits

Author SHA1 Message Date
Markolie
b5cf9bf51b Cryokinesis fix 2015-02-18 00:32:52 +01:00
Markolie
e868c66ad9 Fix warning 2015-02-17 23:55:26 +01:00
Markolie
b39a86078e Let ghosts use teleporter 2015-02-17 23:53:57 +01:00
Markolie
2adf44e4a1 Borer, pAI and posibrain language fix 2015-02-17 23:36:46 +01:00
Markolie
12b297219d Fix AI eye icon 2015-02-17 23:33:32 +01:00
Markolie
21926c9e48 Part 1 of saycode/language/species port from Bay 2015-02-17 23:20:50 +01:00
Markolie
9b61724f01 Let robots put people on optables 2015-02-17 17:13:42 +01: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
f590c215b7 Comma fix 2015-02-17 01:04:38 +01:00
Markolie
d7f17f6eba Bug fixes, give roboticist toolbelt, AI recall shuttle option 2015-02-17 01:04:04 +01:00
Markolie
a84ec1d741 Move mass hallucination event to moderate, change weight of cargo bonus 2015-02-16 23:05:25 +01:00
Markolie
4d8481f83a Merge surgical borgs and crisis borgs 2015-02-16 22:47:55 +01:00
Markolie
9f40758ce5 Move hacking screen to the top when panel is unscrewed 2015-02-16 22:02:41 +01:00
Markolie
95e18fd397 Solar update, convert solar to NanoUI 2015-02-16 21:35:34 +01:00
Markolie
6a2f3f8c84 Fix config oversight 2015-02-16 20:38:24 +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
Markolie
734893ffa1 Add design for handheld crew monitor 2015-02-16 19:21:49 +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
2415f92cbc Merge pull request #320 from ZomgPonies/master
Additional karma check to prevent potential exploit?
2015-02-16 15:15:27 +01:00
ZomgPonies
6c1a629882 Additional karma check to prevent potential exploit? 2015-02-16 06:14:06 -05:00
Mark van Alphen
3bc771b15b Merge pull request #314 from Fox-McCloud/Cargo
Cargo
2015-02-16 06:52:16 +01:00
ZomgPonies
66be012a9c Fixes attacklog toggle not saving accross rounds 2015-02-15 12:23:21 -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
a21f5f5048 Fix 2015-02-14 22:04:19 -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
49d8ab165a Turn chemistry dispenser beaker in overlay so the constructable dispenser has one 2015-02-14 21:34:14 +01:00
Markolie
ba63ce5092 Add pay button to vendors 2015-02-14 19:07:00 +01:00
Markolie
0f64c056bd Fax reply fix 2015-02-14 18:48:20 +01:00
Markolie
85781b8d4c Indent fix 2015-02-14 18:09:35 +01:00
Markolie
f175000ceb Custom fax name check 2015-02-14 18:06:44 +01:00
Markolie
56817e7d0a Ziptie restraint examine 2015-02-14 17:31:56 +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
cbc8be2b4f Fax stamp update 2015-02-14 17:20:18 +01: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
e15975e008 Fix typo 2015-02-14 01:32:38 +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
Markolie
5fdabeda13 Minor R&D search function fix 2015-02-13 23:28:09 +01:00
Tigercat2000
113fd94e88 Fix dressers to actually work. [BUGFIX] 2015-02-13 23:04:04 +01:00