volas
e3d41c3112
Merge remote-tracking branch 'upstream/dev' into sanitize_procs
2015-03-25 01:06:32 +03:00
volas
5fee41d4ba
sanitize() refactor: third pass (misc)
2015-03-25 01:05:21 +03:00
Chinsky
959ee07119
Merge pull request #8607 from Kelenius/ofDrillsAndMiners
...
Updates drill and scanner
2015-03-24 20:05:25 +03:00
Kelenius
78bac425ad
Updates drill and scanner
2015-03-24 18:34:26 +03:00
PsiOmegaDelta
89965420bb
Merge pull request #8603 from Baystation12/dev-freeze
...
Dev freeze
2015-03-24 14:00:57 +01:00
Zuhayr
45f28d5372
Fixes #8485
2015-03-24 13:20:24 +10:30
Zuhayr
a57ba2e26b
Fixes #8589
2015-03-24 12:39:55 +10:30
GinjaNinja32
89bbfbcfad
Fixes depowered doors not being able to be closed
2015-03-23 23:25:58 +00:00
PsiOmega
2a17d656f2
Merge remote-tracking branch 'upstream/dev-freeze' into dev
2015-03-23 11:47:15 +01:00
Zuhayr
a454e77444
Merge pull request #8573 from PsiOmegaDelta/StrayCharacter
...
Fixes stray character.
2015-03-23 10:55:08 +10:30
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
Chinsky
f72d5e10ef
Merge pull request #8570 from PsiOmegaDelta/AIForcedShutters
...
Emergency shutters opened by silicons no longer autoclose.
2015-03-22 21:47:12 +03:00
PsiOmega
9286f10a35
Fixes stray character.
2015-03-22 18:45:03 +01:00
PsiOmega
8562195f05
Emergency shutters opened by silicons no longer autoclose.
2015-03-22 14:57:12 +01:00
Zuhayr
bf8ad6d585
Rebalanced xenoflora sprites, fixed numerous issues.
2015-03-22 16:13:15 +10:30
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
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
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
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
Mandurrrh
618249131e
Gives more/better comfychair color options. Removes unused icons from objects.dmi.
2015-03-18 00:26:42 -04: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
Chinsky
d2518798ec
Merge pull request #8486 from PsiOmegaDelta/NanoLaws
...
NanoUI - Silicon law manager
2015-03-17 14:24:30 +03:00
Zuhayr
e600cdbd3b
Fixes #8430
2015-03-17 19:18:30 +10:30
Chinsky
158a2731e3
Merge pull request #8335 from GinjaNinja32/reagent_dispenser
...
Reagent dispenser rework
2015-03-17 10:05:18 +03:00
Chinsky
376657bdd7
Merge pull request #8353 from Glloyd/goonschedu
...
Goon Process Scheduler for BS12
2015-03-17 10:04:21 +03:00
PsiOmegaDelta
d6bff0a50b
Merge pull request #8502 from Techhead0/dev
...
Botany tool construction and clippers
2015-03-17 07:46:03 +01:00
PsiOmega
7f68403ae4
NanoUI - Silicon law manager
...
NanoUI interface for viewing silicon laws, accessible to both the silicon and admins.
Malf AIs and admins may also add, edit, and remove laws.
2015-03-17 07:22:02 +01:00
GinjaNinja32
458970a617
Merge remote-tracking branch 'upstream/dev' into reagent_dispenser
2015-03-16 21:21:56 +00:00
Techhead0
073f0f1c4a
Adds Tactical Knife
...
Found under Arms & Ammo for hacked autolathes.
2015-03-16 09:38:36 -04:00
PsiOmega
a1cbc80ed3
Merge remote-tracking branch 'upstream/dev-freeze' into dev
2015-03-16 12:39:32 +01:00
PsiOmega
172110b582
Merge remote-tracking branch 'upstream/master' into dev-freeze
2015-03-16 12:37:43 +01:00
Techhead0
2ca80a06b9
Botany tool construction and clippers
...
Adds hatchets and mini hoes to the autolathe recipe list. Material costs
are unchanged. Also adds plant clippers (reskinned wirecutters) to
secure hydroponics lockers.
2015-03-15 19:15:35 -04:00
Chinsky
1ead71a993
Merge pull request #8479 from Techhead0/dev
...
More things in belts.
2015-03-15 04:50:03 +03:00
