Commit Graph

725 Commits

Author SHA1 Message Date
DZD
bee904d99f Paperwork NT Logo Fix
- Fixes the problem where the image for using [logo] in paperwork was
not appearing correctly.
2015-01-13 17:08:55 -05:00
Markolie
037f7e71b8 Talisman image 2014-12-21 16:38:23 +01:00
DJSnapshot
54b2e5f7a7 Fixed up security, medical, card, and crew. Made Computer 3 actually do what it's supposed to do.
Conflicts:
	code/datums/browser.dm
	html/browser/common.css
2014-06-23 06:16:29 -04:00
Brian Cook
ce40b74fd7 Improved GUI for requesting pAI
Made the pAI Request Module and the pAI Availability List pretty.

Conflicts:
	code/modules/mob/living/silicon/pai/recruit.dm
2014-04-29 20:46:43 -04:00
Brian Cook
a93f864ae3 Refined GUI more
pAI background updated and no longer externally referenced. Corrected
stray typos. Added more power on/off lights for certain downloaded
modules.
2014-04-29 20:39:24 -04:00
Brian Cook
9149e2df96 pAI GUI changes
The pAI GUI background image still need to be properly linked.
2014-04-29 20:39:08 -04:00
Rob Nelson
2389e9a778 Fix a bunch of jukebox issues, clean up UI a bit, add feedback, allow slapping it to reset if broken. 2014-04-19 20:33:22 -04:00
Rob Nelson
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
ZomgPonies
36c7fa3dcd computer3 merge 2013-11-03 14:18:54 -05:00
ZomgPonies
420bb6f506 Fixed up AI Malfunction 2013-09-17 23:06:51 -04:00
Mloc-Argent
51ea24b0fe Genericify this shit.
Signed-off-by: Mloc-Argent <colmohici@gmail.com>
2013-09-01 21:17:09 +01:00
Zuhayr
375437a6cf Changelog merge. I hate the changelog. 2013-08-12 11:20:41 -07:00
Erthilo
8d7e75e619 Changelog. 2013-08-11 21:35:29 +01:00
comma
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
comma
625eecddaa Merge branch 'dev' of https://github.com/Baystation12/Baystation12 into pain
Conflicts:
	html/changelog.html
2013-08-04 00:43:10 +04:00
comma
61812b9668 changelog.html 2013-08-04 00:15:03 +04:00
comma
80cc45bc6b Changelog 2013-08-01 10:04:49 +04:00
Kilakk
ceb5facd76 Added Erthilo's commit to the changelog - whoops 2013-07-30 17:46:12 -04:00
Kilakk
7cd50d38a3 Committing changelog. 2013-07-30 17:41:03 -04:00
Erthilo
89ffc92168 Fixes text errors in ghost manifest runes and newscasters with apostrophes. 2013-07-30 22:36:42 +01:00
Erthilo
02f7e34f66 Changelog. 2013-07-30 20:43:02 +01:00
Segrain
41e9c591b3 Changelog. 2013-07-28 02:12:02 +03:00
Kilakk
1bb40348b1 Committing changelog 2013-07-26 14:32:33 -04:00
Mloc-Argent
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
Mloc-Argent
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
LordBraindead
f172e085b1 Update changelog.html
underped the changelog too
2013-07-14 21:40:32 +02:00
LordBraindead
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
comma
da35278439 Merge remote-tracking branch 'remotes/origin/bleeding-edge-freeze' into viro
Conflicts:
	html/changelog.html
2013-07-11 02:53:58 +04:00
comma
aaa1228e11 Changelog. 2013-07-11 02:52:36 +04:00
comma
2509e8f836 Changelog entry. 2013-07-09 14:19:05 +04:00
Spamcat
1541b5dec8 Changelog. 2013-07-05 04:44:54 +04:00
Segrain
66265e2689 Recordskeeping update. 2013-07-03 05:55:18 +03:00
Whitellama
e49a80d822 Fixed changelog conflicts 2013-06-30 13:59:24 -07:00
Whitellama
9ec3996cf4 Updated changelog with space ninja gamemode changes 2013-06-26 17:30:32 -07:00
Segrain
ca635a37f3 Conflict fix. I hope. 2013-06-24 12:02:03 +03:00
fauxtada
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
Segrain
65731b232b Quickfix and changelog. 2013-06-23 20:52:19 +03:00
Chinsky
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
Cael Aislinn
c8fd18a637 changelog update
Signed-off-by: Cael Aislinn <cael_aislinn@yahoo.com.au>
2013-06-23 10:28:15 +10:00
jupotter
97955c7ee2 Updated changelog 2013-06-21 17:38:30 +02:00
Segrain
9a59c967f1 Cyborg update. 2013-06-18 23:49:40 +03:00
Segrain
6c43ff47e9 Changelog update. 2013-06-18 03:05:37 +03:00
Kilakk
ccd7bd6dae Changelog again 2013-06-13 13:02:39 -04:00
Asanadas
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
Kilakk
7df34d817f Updating the changelog 2013-06-13 00:09:20 -04:00
Chinsky
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
Zuhayr
22c3dcfaa9 Changelog. 2013-06-12 20:34:36 -07:00
meyar
6af53ddf1b Change Lawg 2013-06-11 17:07:16 -04:00
Zuhayr
85b945cfbf Merge branch 'master' of https://github.com/Baystation12/Baystation12 2013-06-10 14:42:46 -07:00
Segrain
673f3ddb37 Fix for ordering hidden supplypacks. 2013-06-09 10:25:27 +03:00