ee4caa1d55
Holy shit air alarms work properly now. Yes, this time it's tested.
...
* Area air alerts are the maximum of all air alarm local danger levels.
* Doors are no longer fumbled and close upon alert level 2, and when all alert levels clear, the DOORS OPEN AUTOMATICALLY OH MY GOD
* Air alarm icons refresh properly and only show red in actually dangerous areas. (Area alerts only cause yellow icons)
* Alerts clear automatically
* Silicons can set thresholds now (someone forgot an !)
Conflicts:
code/game/area/areas.dm
html/changelog.html
2014-01-05 22:41:43 -05:00
36c7fa3dcd
computer3 merge
2013-11-03 14:18:54 -05:00
420bb6f506
Fixed up AI Malfunction
2013-09-17 23:06:51 -04:00
51ea24b0fe
Genericify this shit.
...
Signed-off-by: Mloc-Argent <colmohici@gmail.com >
2013-09-01 21:17:09 +01:00
375437a6cf
Changelog merge. I hate the changelog.
2013-08-12 11:20:41 -07:00
8d7e75e619
Changelog.
2013-08-11 21:35:29 +01:00
e45f429e4c
Merge branch 'dev-freeze' of https://github.com/Baystation12/Baystation12
...
Conflicts:
code/modules/mob/living/silicon/robot/robot.dm
maps/tgstation.2.1.0.0.1.dmm
2013-08-04 01:40:32 +04:00
625eecddaa
Merge branch 'dev' of https://github.com/Baystation12/Baystation12 into pain
...
Conflicts:
html/changelog.html
2013-08-04 00:43:10 +04:00
61812b9668
changelog.html
2013-08-04 00:15:03 +04:00
80cc45bc6b
Changelog
2013-08-01 10:04:49 +04:00
ceb5facd76
Added Erthilo's commit to the changelog - whoops
2013-07-30 17:46:12 -04:00
7cd50d38a3
Committing changelog.
2013-07-30 17:41:03 -04:00
89ffc92168
Fixes text errors in ghost manifest runes and newscasters with apostrophes.
2013-07-30 22:36:42 +01:00
02f7e34f66
Changelog.
2013-07-30 20:43:02 +01:00
41e9c591b3
Changelog.
2013-07-28 02:12:02 +03:00
1bb40348b1
Committing changelog
2013-07-26 14:32:33 -04:00
8575b7a286
And once again, did that the wrong way around. Whoops.
...
Fully reverts #3316 .
Signed-off-by: Mloc-Argent <colmohici@gmail.com >
2013-07-20 18:41:50 +01:00
adc3c14779
Revert #3316 from BEF due to compile errors and (assumed) missing files.
...
Signed-off-by: Mloc-Argent <colmohici@gmail.com >
2013-07-20 18:38:00 +01:00
f172e085b1
Update changelog.html
...
underped the changelog too
2013-07-14 21:40:32 +02:00
08d2e22220
fire update
...
enabled fire to destroy floors and objects
also tweaked the behaviour of glass to enable glasslocks against fire
also made fire extingiushers stop being useless
2013-07-14 21:20:45 +02:00
da35278439
Merge remote-tracking branch 'remotes/origin/bleeding-edge-freeze' into viro
...
Conflicts:
html/changelog.html
2013-07-11 02:53:58 +04:00
aaa1228e11
Changelog.
2013-07-11 02:52:36 +04:00
2509e8f836
Changelog entry.
2013-07-09 14:19:05 +04:00
1541b5dec8
Changelog.
2013-07-05 04:44:54 +04:00
66265e2689
Recordskeeping update.
2013-07-03 05:55:18 +03:00
e49a80d822
Fixed changelog conflicts
2013-06-30 13:59:24 -07:00
9ec3996cf4
Updated changelog with space ninja gamemode changes
2013-06-26 17:30:32 -07:00
ca635a37f3
Conflict fix. I hope.
2013-06-24 12:02:03 +03:00
1b126bd1d5
Changelog - BEF
...
Whoopsie, forgot to do a changelog for all the map changes done for this merge~
2013-06-23 19:33:43 -07:00
65731b232b
Quickfix and changelog.
2013-06-23 20:52:19 +03:00
c9f6894163
Merge branch 'master' of https://github.com/Baystation12/Baystation12 into bleeding-edge-freeze
...
Conflicts:
html/changelog.html
maps/tgstation.2.1.0.0.1.dmm
2013-06-23 11:17:03 +04:00
c8fd18a637
changelog update
...
Signed-off-by: Cael Aislinn <cael_aislinn@yahoo.com.au >
2013-06-23 10:28:15 +10:00
97955c7ee2
Updated changelog
2013-06-21 17:38:30 +02:00
9a59c967f1
Cyborg update.
2013-06-18 23:49:40 +03:00
6c43ff47e9
Changelog update.
2013-06-18 03:05:37 +03:00
ccd7bd6dae
Changelog again
2013-06-13 13:02:39 -04:00
7479fd272c
Added Malsquando's colored suit to the hop's wardrobe locker.
...
Everything should be working correctly.
2013-06-13 09:41:52 -04:00
7df34d817f
Updating the changelog
2013-06-13 00:09:20 -04:00
bb26c5a7cb
Merge branch 'bleeding-edge-freeze' of https://github.com/Baystation12/Baystation12 into newstuff
...
Conflicts:
code/game/objects/structures/crates_lockers/closets/secure/security.dm
2013-06-12 23:11:28 +04:00
22c3dcfaa9
Changelog.
2013-06-12 20:34:36 -07:00
6af53ddf1b
Change Lawg
2013-06-11 17:07:16 -04:00
85b945cfbf
Merge branch 'master' of https://github.com/Baystation12/Baystation12
2013-06-10 14:42:46 -07:00
673f3ddb37
Fix for ordering hidden supplypacks.
2013-06-09 10:25:27 +03:00
e40140be03
Merge branch 'master' of https://github.com/Baystation12/Baystation12 into bleeding-edge-freeze
...
Conflicts:
html/changelog.html
maps/tgstation.2.1.0.0.1.dmm
2013-06-08 05:55:42 +04:00
9779a2e204
Chaaaaaange
2013-06-06 18:28:37 -04:00
cfbc3e5352
Added webbing and vests to lockers.
2013-06-05 21:35:56 +04:00
65893426ba
Bumping into firelocks in exosuit.
2013-06-05 21:02:25 +03:00
4547248351
changelog
2013-06-05 01:28:26 -04:00
9e71180e1b
Merge conflict resolution, using BEF.
2013-06-05 14:22:04 +09:30
cf540425c1
changelawg
2013-06-04 02:28:41 -04:00
Rob Nelson