Commit Graph

17715 Commits

Author SHA1 Message Date
Zuhayr
97112c8a4c Replaced display_name with name, worked on severing limbs and damage propagation. 2015-03-25 19:07:22 +10:30
Zuhayr
f017764e64 More work on adjusting/tweaking/fixing the limb port to make it functional. 2015-03-25 00:59:17 +10:30
Zuhayr
3fe4162719 Merge branch 'dev' of https://github.com/Baystation12/Baystation12 into limbs 2015-03-25 00:29:59 +10:30
Zuhayr
a63b9b4e73 Beginning to port over new icon update from limbs branch. WIP 2015-03-24 23:48:54 +10:30
PsiOmegaDelta
89965420bb Merge pull request #8603 from Baystation12/dev-freeze
Dev freeze
2015-03-24 14:00:57 +01:00
Zuhayr
b9072baa97 Merge with dev. 2015-03-24 14:41:07 +10:30
Zuhayr
7e615521ef Should fix issues with invisible seeds/products/plants. 2015-03-24 13:51:44 +10:30
Zuhayr
45f28d5372 Fixes #8485 2015-03-24 13:20:24 +10:30
Zuhayr
ef50918b9c Hackfix for #8588 2015-03-24 12:46:07 +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
bd48c76620 Merge remote-tracking branch 'upstream/master' into dev-freeze 2015-03-23 21:14:32 +01:00
PsiOmegaDelta
c85e1ce786 Merge pull request #8592 from comma/maxlen
Readded missing check for paper editing
2015-03-23 21:13:43 +01:00
Chinsky
a9ee51bc64 Readded missing check for paper editing
Removed it back when HTML in paper was a thing again adn never put back in, can possibly cause issues.
Thanks @volas for noticing.
2015-03-23 23:02:43 +03:00
Zuhayr
14950a7e3a Merge pull request #8584 from Kelenius/ofBorgsAndGlass
Fixed construction borg's Rglass
2015-03-23 21:34:36 +10:30
PsiOmega
2a17d656f2 Merge remote-tracking branch 'upstream/dev-freeze' into dev 2015-03-23 11:47:15 +01:00
PsiOmega
1908ba59e2 Merge remote-tracking branch 'upstream/master' into dev-freeze 2015-03-23 11:45:32 +01:00
Kelenius
026ec265d4 Fixed construction borg's Rglass 2015-03-23 12:11:58 +03:00
Zuhayr
a454e77444 Merge pull request #8573 from PsiOmegaDelta/StrayCharacter
Fixes stray character.
2015-03-23 10:55:08 +10:30
Zuhayr
1474c6fdd1 Merge pull request #8574 from PsiOmegaDelta/AIDel
Deletes AI eye along with the AI.
2015-03-23 10:54:36 +10:30
Chinsky
f4dd077d50 Merge pull request #8571 from PsiOmegaDelta/EyeFix
Fixes #8534.
2015-03-22 21:47:17 +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
767f4dd537 Deletes AI eye along with the AI. 2015-03-22 18:51:15 +01:00
PsiOmega
9286f10a35 Fixes stray character. 2015-03-22 18:45:03 +01:00
PsiOmega
f9b8c2dbc9 Fixes #8534.
Sets icontype to its proper value.
2015-03-22 16:25:24 +01:00
PsiOmega
8562195f05 Emergency shutters opened by silicons no longer autoclose. 2015-03-22 14:57:12 +01:00
Zuhayr
8791c2bf1e Fixing a typo.
! and ~ both compile. Feh.
2015-03-23 00:05:29 +10:30
Zuhayr
9deebbf9f6 Vines should now respect coverage and magboots. 2015-03-22 16:25:22 +10:30
Zuhayr
bf8ad6d585 Rebalanced xenoflora sprites, fixed numerous issues. 2015-03-22 16:13:15 +10:30
GinjaNinja32
26d878fb02 Move closing bracket outside <i> tag
Opening bracket is outside. Consistency!
2015-03-21 21:08:54 +00: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
GinjaNinja32
04640eafb1 Fix issues with skill class procs 2015-03-20 22:47:51 +00:00
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