PsiOmega
984d5ee337
More #10285 fixes.
...
This one is dev-freeze only. Adds another sanity check to trans_to_holder to avoid runtime issues.
2015-07-26 10:46:58 +02:00
PsiOmega
659b07415d
Merge remote-tracking branch 'upstream/master' into dev-freeze
...
Conflicts:
code/game/machinery/rechargestation.dm
code/game/mecha/equipment/tools/medical_tools.dm
maps/exodus-1.dmm
2015-07-26 10:00:12 +02:00
PsiOmega
3c1a3f6951
Fixes #10285 .
...
Adds Topic() input sanity checking.
2015-07-25 14:18:10 +02:00
PsiOmega
835d4ddcde
Fixes #10267 .
...
Laws are always pre-sanitized.
2015-07-25 13:30:25 +02:00
Snapshot
a13467d8a4
Merge pull request #10286 from comma/tor
...
Updates ToR list URL
2015-07-24 17:31:15 -07:00
Chinsky
0753429740
Updates ToR list URL
2015-07-25 03:27:46 +03:00
Chinsky
90ae24dd1c
Merge pull request #10135 from Kelenius/ofBorgsAndShakers
...
Of borgs and shakers
2015-07-23 21:41:48 +03:00
Mloc
30f448cdd2
Merge pull request #10253 from PJB3005/bay-lights
...
Lighting: The sanicking
2015-07-22 14:55:49 +01:00
Zuhayr
3579ab8373
Merge pull request #10259 from mwerezak/rig-module-fix
...
Fixes #10151
2015-07-22 10:45:21 +09:30
mwerezak
c7488c712b
Fixes #10151
2015-07-21 20:34:39 -04:00
PJB3005
b6a1ee2adf
Lighting: The sanicing
2015-07-21 15:58:39 +02:00
PsiOmegaDelta
9aa79bc6f1
Merge remote-tracking branch 'upstream/master' into dev-freeze
2015-07-21 14:25:46 +02:00
Kelenius
83cc80b341
Fixes #9719 - dead goats retaliate
...
Goats now only produce a message if they are alive
2015-07-20 17:01:29 +03:00
PsiOmegaDelta
d1ae6b275c
Fixes #10244 .
...
Adds a return statement.
2015-07-20 09:14:06 +02:00
Kelenius
b6beb8c299
Admin logs for borg hypo
2015-07-20 09:31:02 +03:00
PsiOmegaDelta
ed2a49ba3e
Merge remote-tracking branch 'upstream/master' into dev-freeze
...
Conflicts:
code/game/objects/items/stacks/medical.dm
2015-07-20 08:20:40 +02:00
PsiOmegaDelta
c2010bd612
Merge pull request #10236 from mwerezak/robot-custom-icon
...
Fixes #10215
2015-07-19 12:56:00 +02:00
PsiOmegaDelta
8703bcb72d
Merge pull request #10238 from mwerezak/sleepygas
...
Fixes #9868
2015-07-19 12:55:25 +02:00
Zuhayr
a45d26079f
Merge pull request #10239 from mwerezak/lighting-fix
...
Fixes #10210
2015-07-19 20:13:55 +09:30
PsiOmegaDelta
cac095e53a
Merge pull request #10237 from mwerezak/throw-mode
...
Fixes #10230
2015-07-19 10:55:56 +02:00
mwerezak
ac2dd5f3ca
Fixes #10210
2015-07-19 00:25:09 -04:00
mwerezak
4ea1379b33
Fixes #10230
...
Moves throw mode procs up to /mob level, clicking on a non-turf or an
atom that is not in a turf cancels throw mode.
2015-07-18 23:27:09 -04:00
mwerezak
428138af87
Fixes #10215
...
Robot custom sprite config entries are now split at the first dash,
instead of at every dash.
The config is parsed once at startup.
2015-07-18 23:05:40 -04:00
PsiOmega
b308e34388
Fixes #10170 .
...
Removes the bunsen burner completely. Was after the chem rework basically never referenced anyway.
2015-07-18 22:51:20 +02:00
PsiOmegaDelta
23736bc42b
Merge pull request #10233 from Baystation12/master
...
Master -> Dev-freeze.
2015-07-18 22:45:44 +02:00
Chinsky
3a40f4e539
Merge pull request #10225 from PsiOmegaDelta/150718-BurnItAway
...
Fixes #10170 .
2015-07-18 22:57:06 +03:00
PsiOmegaDelta
8b769c5d24
Merge pull request #10195 from Kelenius/ofSpaceAndWounds
...
Of space and wounds
2015-07-18 20:04:39 +02:00
PsiOmega
8aac45bc42
Fixes #10170 .
...
Overrides the AI attack proc.
Saving any removal of burners for the dev branch due to merge concerns.
2015-07-18 19:36:01 +02:00
Kelenius
4e2049ccaf
Removes a colon
2015-07-18 14:53:35 +03:00
PsiOmega
d1a05d9fd6
Compilation fixes.
2015-07-17 23:11:42 +02:00
PsiOmega
b4d15ceb6e
Merge remote-tracking branch 'upstream/master' into dev-freeze
...
Conflicts:
code/modules/mob/living/carbon/human/examine.dm
code/modules/mob/living/carbon/human/inventory.dm
2015-07-17 23:09:24 +02:00
HarpyEagle
bcd81af4f6
Bandaid fix for sealed rig removal
2015-07-16 10:52:26 -04:00
PsiOmegaDelta
dadb262ea1
Merge pull request #10192 from Kelenius/ofImprinterAndProhon
...
Of imprinter and prohon
2015-07-16 08:36:17 +02:00
GinjaNinja32
6ec39e1f51
Fixes 'plural' gender and fixes some instances of not using the t_* variables
...
Todo: fully rework this to not need lots of t_* variables, they're annoying and kinda crappy. Maybe a gender datum; /datum/gender/male/var/he = "he" or something.
2015-07-15 19:00:54 +01:00
Kelenius
b8a354467e
Fixes #9967
...
Pulling someone through space or an area without gravity will no longer
deal damage to them
2015-07-15 18:27:27 +03:00
Chinsky
a0e0cc5cd5
Merge pull request #10194 from GinjaNinja32/isAI
...
removes isAI() from broken merge
2015-07-15 18:26:32 +03:00
GinjaNinja32
efaf8659b8
Fixes usage of isAI()
2015-07-15 15:51:11 +01:00
GinjaNinja32
e2d7fd9e14
removes isAI() from broken merge
2015-07-15 15:45:55 +01:00
Kelenius
4c8dfcf17e
Fixes #10127 , fixes #10139
...
Removes phoron requirement from shield circuit, adds a return to sheet
adding so ..() is not called when attacked with a sheet.
2015-07-15 16:49:22 +03:00
Kelenius
3de25ceb00
Fixes #8161
2015-07-15 16:34:05 +03:00
Zuhayr
03927918c6
Merge pull request #10187 from Baystation12/master
...
Master > dev-freeze
2015-07-15 16:10:13 +09:30
Zuhayr
a6ec43f0b1
Merge pull request #10176 from mwerezak/ce-rig-fix
...
Fixes #8545
2015-07-15 06:48:45 +09:30
Zuhayr
c6d095aef1
Fixes #10118
2015-07-15 06:46:21 +09:30
HarpyEagle
be34a7cfc7
Fixes projectiles ignoring their specified target zone
2015-07-14 14:20:53 -04:00
HarpyEagle
bf2bcba01c
Merge branch 'dev-freeze' of https://github.com/Baystation12/Baystation12 into ert-lights2
2015-07-14 10:15:37 -04:00
PsiOmegaDelta
8da7141af1
Merge remote-tracking branch 'upstream/master' into dev-freeze
...
Conflicts:
code/modules/mining/abandonedcrates.dm
code/modules/mob/living/simple_animal/simple_animal.dm
2015-07-14 08:11:11 +02:00
mwerezak
5ab051d7a8
Fixes #8545
2015-07-14 00:38:58 -04:00
Zuhayr
b12d1d4bdd
Refactors spiderbots a little, cleans up some spans, updates them.
2015-07-14 06:56:52 +09:30
Zuhayr
5e1ae26b74
Comment cleanup, adds TODOs for a bunch of minor things that the antag system may need to address before the end of freeze.
2015-07-14 05:19:01 +09:30
Zuhayr
cd380aba24
Removed the last few references to MODE, fixed some oversights with player_is_antag().
2015-07-14 05:19:00 +09:30
