Commit Graph

17688 Commits

Author SHA1 Message Date
volas
5fee41d4ba sanitize() refactor: third pass (misc) 2015-03-25 01:05:21 +03:00
volas
f8822626bb sanitize() refactor: second pass(other sanitize functions) 2015-03-23 01:38:09 +03:00
volas
855755f808 sanitize() refactor: first pass (sanitize) 2015-03-22 23:31:19 +03:00
volas
a5cfca1ee8 Merge remote-tracking branch 'upstream/dev' into sanitize_procs
Conflicts:
	code/__HELPERS/text.dm
2015-03-22 20:37:17 +03:00
Zuhayr
a8f44cae98 Resolving bugs with spawn order and delays. 2015-03-21 11:49:42 +10:30
Zuhayr
d8018db5c9 Finally got things working from vote to roundstart to join to death. 2015-03-21 11:14:59 +10:30
Zuhayr
fe6cd5af13 Dropped antagonist folder down a directory level. 2015-03-21 11:14:48 +10:30
Zuhayr
4d14722b2a Split antagonist.dm up. 2015-03-21 11:14:47 +10:30
Zuhayr
3718245e45 Moves asteroid generation prior to geometry initialization. Adds config for asteroid generation. 2015-03-21 11:13:53 +10:30
Zuhayr
2c269e5159 More work on Heist. Remapped the Vox shuttle and added a base for it. Tweaked spawn values etc. 2015-03-21 11:13:48 +10:30
Zuhayr
8d698f0c06 First pass on making heist a pirate mode (human based) 2015-03-21 11:13:05 +10:30
Zuhayr
4fdc00dee4 Working on gamemode/antagonist code. 2015-03-21 11:08:22 +10:30
Zuhayr
d79af13a2c Resolving bugs with the game mode refactor. 2015-03-21 11:08:21 +10:30
Zuhayr
98da191ac3 Gamemode refactor, lots of code shuffles, PR will have details. 2015-03-21 11:08:17 +10:30
Zuhayr
cd0bf9622d Merge pull request #8557 from Baystation12/dev-freeze
Dev freeze
2015-03-21 11:03:58 +10:30
Chinsky
5fae54e4a8 Merge pull request #8554 from Zuhayr/dev-freeze
Fixes #8543
2015-03-20 17:04:23 +03:00
Zuhayr
87fe7d80f0 Merge pull request #8542 from PsiOmegaDelta/IWasFrozenToday
Cryopod naming fixes.
2015-03-20 21:00:07 +10:30
PsiOmega
7ab57a4917 Merge remote-tracking branch 'upstream/dev-freeze' into dev
Conflicts:
	code/game/objects/items/weapons/storage/fancy.dm
	code/modules/mob/living/carbon/human/life.dm
2015-03-20 08:44:52 +01:00
PsiOmega
6e2488ccb0 Merge remote-tracking branch 'upstream/master' into dev-freeze
Conflicts:
	code/game/objects/items/stacks/sheets/sheet_types.dm
	code/game/objects/structures/stool_bed_chair_nest/chairs.dm
2015-03-20 08:26:34 +01:00
Zuhayr
fb52e095d0 Fixes #8543 2015-03-20 12:37:55 +10:30
PsiOmega
3d9d05afce Fixes #8107.
The announcer again has its given name, rather than a randomly selected one.
The announcer now states its business, rather than talks about it.
The announcer now uses the proper frequency.
2015-03-19 21:33:58 +01:00
PsiOmega
44c8b03fcd Cryopod naming fixes.
Fixes issue where the cryopod name would not update if left willingly.
Fixes issue where the cryopod name would not update if forced inside.
2015-03-19 20:10:51 +01:00
PsiOmega
1f5de7f64f Ports /tg/ & Paradise ghost sight.
Ghosts can now toggle darkness and seeing ghostly things independently.
Includes some extra work to allow observers to see AI eyes while (mostly) preventing cultists from doing the same.
2015-03-19 16:14:02 +01:00
Chinsky
be8e76a01e Merge pull request #8535 from Kelenius/ofCandlesAndTime
Makes candles last longer
2015-03-19 00:20:07 +03:00
Kelenius
cc9f15dd67 Makes candles last longer 2015-03-18 20:57:51 +03:00
Vivalas
1040ffbede Fixes #8519
Gives CMO EVA access, like they should have.
2015-03-18 09:06:01 -05:00
PsiOmega
34a4bb26bd Silicon law management update.
Adds missing Topic/href checks, reducing risk of exploits.
Ensures a silicon cannot get stuck on the second law management page should it suddenly be un-malfed.
Changes Malf definition. This allows borgs to view and state alternative law sets, while disallowing law edits (for as long as they are slaved/not traitors themselves).
2015-03-18 08:17:46 +01:00
Mandurrrh
618249131e Gives more/better comfychair color options. Removes unused icons from objects.dmi. 2015-03-18 00:26:42 -04:00
MrSnapwalk
9463ab028a Adds Andrewmeythaler's custom item. 2015-03-17 22:19:13 -05:00
Ravensdale
2201ab21d4 Makes radiation shielded an area flag 2015-03-17 18:54:45 -07:00
Zuhayr
961272817f Merge pull request #8461 from comma/biofluff
Added support for multiple cloning vats per single console.
2015-03-18 02:55:05 +10:30
Zuhayr
11b1b40358 Merge pull request #8505 from PsiOmegaDelta/NanoDebug
Makes it possible to debug the NanoUI manager.
2015-03-18 02:52:22 +10:30
Zuhayr
ffcfa9aff2 Merge pull request #8515 from PsiOmegaDelta/MagicalLawZero
Law Zero phrasing is now a config option.
2015-03-18 02:52:12 +10:30
PsiOmegaDelta
48dce2d1fe Merge pull request #8507 from Techhead0/firepat2
Can pat burning mobs to put them out.
2015-03-17 16:35:14 +01:00
PsiOmega
744ef41d8e Law Zero phrasing is now a config option.
The default value is a non-objective phrasing. config.txt contains the default phrasing should it be desired.
2015-03-17 14:47:32 +01:00
Zuhayr
ce062881ae Merge pull request #8511 from PsiOmegaDelta/TrackMob
AIs can now use the crew monitor console for tracking.
2015-03-17 23:08:44 +10:30
Chinsky
d2518798ec Merge pull request #8486 from PsiOmegaDelta/NanoLaws
NanoUI - Silicon law manager
2015-03-17 14:24:30 +03:00
Chinsky
d3b202db4d Merge pull request #8512 from Zuhayr/dev-freeze
Fixes.
2015-03-17 14:19:59 +03:00
Techhead0
7de83ec6b0 Can pat burning mobs to put them out.
Click on them with help intent to do so. This has a mild chance of
lighting you on fire yourself. If you're already doused in fuel, this is
guaranteed. Also, burning people can set others on fire by hugging them.

Now with improved if(do_mob)
2015-03-17 07:13:48 -04:00
PsiOmega
934de7eb37 Merge remote-tracking branch 'upstream/dev-freeze' into dev 2015-03-17 12:03:34 +01:00
PsiOmega
018bd4ebdd Merge remote-tracking branch 'upstream/master' into dev-freeze 2015-03-17 12:01:09 +01:00
PsiOmega
9d2ba41a3a Ghosts with antagHUD enabled can now see AI/borg laws on examine. 2015-03-17 11:39:22 +01:00
Zuhayr
92f53d6b80 Fixes #8478 2015-03-17 20:08:46 +10:30
Zuhayr
033f758abd Fixes #8477 2015-03-17 20:04:07 +10:30
Zuhayr
145b4442e5 Fixes #8388 2015-03-17 19:49:18 +10:30
PsiOmega
f2d3f7833b AIs can now use the crew monitor console for tracking.
Due to balance concerns, the headache of handling fake identities, meta, etc., this only works for crew members with tracking sensors enabled.
2015-03-17 10:11:18 +01:00
Zuhayr
beaba0b88f Fixes #8440 2015-03-17 19:35:25 +10:30
Zuhayr
b766f9efcf Fixes #8378 2015-03-17 19:20:33 +10:30
Zuhayr
7cbe2c94fb Fixes #8388 2015-03-17 19:19:28 +10:30
Zuhayr
e600cdbd3b Fixes #8430 2015-03-17 19:18:30 +10:30