Zuhayr
|
3895349787
|
Merge pull request #8374 from Baystation12/dev-freeze
Dev freeze into dev
|
2015-03-07 12:05:32 +10:30 |
|
Zuhayr
|
ac860b976a
|
Fixing compile issues, adjusted buckle code after a weird merge.
|
2015-03-07 11:52:14 +10:30 |
|
Zuhayr
|
9f1e04aa50
|
Thanks TortoiseGit.
|
2015-03-07 11:40:00 +10:30 |
|
Zuhayr
|
1984ef6e51
|
Master into dev-freeze.
|
2015-03-07 11:33:39 +10:30 |
|
PsiOmega
|
0262ab0de0
|
Runtime fixes
Fixes
````
runtime error: Cannot read null.name
proc name: sql report cyborg death (/proc/sql_report_cyborg_death)
source file: statistics.dm,87
usr: the maintenance drone (106) (/mob/living/silicon/robot/drone)
src: null
````
````
runtime error: Cannot read null.name
proc name: sql report death (/proc/sql_report_death)
source file: statistics.dm,52
usr: null
src: null
````
````
runtime error: Cannot read null.armor
proc name: infection check (/proc/infection_check)
source file: helpers.dm,16
usr: null
src: null
````
````
runtime error: bad client
proc name: open (/datum/nanoui/proc/open)
source file: nanoui.dm,419
usr: null
src: /datum/nanoui (/datum/nanoui)
/datum/nanoui (/datum/nanoui): open()
````
````
runtime error: undefined variable /obj/effect/plantsegment/var/movable
proc name: update canmove (/mob/proc/update_canmove)
source file: mob.dm,862
usr: null
src: the monkey (643) (/mob/living/carbon/monkey)
````
|
2015-03-06 18:39:44 +01:00 |
|
Daniel García Baldomir
|
94477bd66c
|
Minor fixes on the overlays. Made holosigns functional again.
|
2015-03-05 21:47:26 +01:00 |
|
PsiOmega
|
3e9f33136a
|
Merge remote-tracking branch 'upstream/dev-freeze' into dev
Conflicts:
code/game/objects/effects/decals/Cleanable/fuel.dm
maps/exodus-5.dmm
|
2015-03-05 09:20:20 +01:00 |
|
PsiOmega
|
173f0527eb
|
Merge remote-tracking branch 'upstream/master' into dev-freeze
Conflicts:
code/modules/mob/living/carbon/human/life.dm
code/modules/nano/nanomanager.dm
code/modules/surgery/surgery.dm
|
2015-03-05 08:05:44 +01:00 |
|
mwerezak
|
f8831fa513
|
Adjusts human temperature damage intervals
|
2015-03-03 19:31:01 -05:00 |
|
PsiOmega
|
25ca1af5d3
|
An inhabited AI core can now be pushed.
No longer can an AI chassis no longer suddenly not be pushed once it's been activated.
|
2015-03-03 16:18:52 +01:00 |
|
mwerezak
|
1a4cedd412
|
Fixes #7363
|
2015-03-02 13:24:52 -05:00 |
|
PsiOmega
|
98be5cbce8
|
Synth medical sensors now report dead/alive status.
Synths with medical augmentation sensors enabled will now see the dead/alive status of crew members with suit sensors set to at least binary level.
|
2015-03-02 13:04:02 +01:00 |
|
PsiOmega
|
02a1e1d129
|
Merge remote-tracking branch 'upstream/dev-freeze' into dev
Conflicts:
code/modules/clothing/spacesuits/rig/suits/light.dm
|
2015-03-01 21:15:47 +01:00 |
|
PsiOmega
|
cf11fad8bc
|
Merge remote-tracking branch 'upstream/master' into dev-freeze
|
2015-03-01 21:13:38 +01:00 |
|
Zuhayr
|
b3bae8a509
|
Split language.dm across multiple files.
|
2015-03-01 02:01:43 +10:30 |
|
Zuhayr
|
e2f69bd6cd
|
Moves language.dm into its own folder.
|
2015-03-01 02:01:37 +10:30 |
|
PsiOmega
|
00becda446
|
Few Fixes.
Fixes #8304.
Fixes #8306.
|
2015-02-28 14:29:30 +01:00 |
|
Zuhayr
|
a0452f3423
|
Alternative fix for golem damage.
|
2015-02-28 17:08:30 +10:30 |
|
Zuhayr
|
14321003f1
|
Merge branch 'dev-freeze' of https://github.com/Zuhayr/Baystation12 into dev-freeze
|
2015-02-28 17:04:22 +10:30 |
|
Zuhayr
|
c659ebefde
|
Fixes #8176
|
2015-02-28 16:47:27 +10:30 |
|
Zuhayr
|
172cecaa80
|
Merge pull request #8305 from DJSnapshot/dev-freeze
gets rid of MC tab. Returns it back to status tab.
|
2015-02-28 16:27:20 +10:30 |
|
Zuhayr
|
f7983e7732
|
Merge pull request #8293 from comma/interfacefix
Couple fixes
|
2015-02-28 16:22:36 +10:30 |
|
Zuhayr
|
5ec131fa32
|
Merge pull request #8312 from hockeygoalie5/fixes
Fixes #8255, #8231, #8265
|
2015-02-28 12:14:15 +10:30 |
|
Mustafa Kalash
|
14f76324b9
|
Fixes #8231. Adds on_hear_radio proc for observers to add tracking.
|
2015-02-27 17:18:47 -05:00 |
|
Chinsky
|
7f01af6b7d
|
Merge pull request #8297 from PsiOmegaDelta/CameraCoverage
Camera coverage fixes.
|
2015-02-27 13:11:21 +03:00 |
|
PsiOmega
|
7e498e1cf7
|
Merge remote-tracking branch 'upstream/master' into dev-freeze
Conflicts:
code/modules/hydroponics/seed_datums.dm
code/modules/hydroponics/trays/tray_apiary.dm
code/modules/power/apc.dm
code/setup.dm
|
2015-02-27 09:06:48 +01:00 |
|
DJSnapshot
|
12024f07aa
|
gets rid of MC tab. Returns it back to status tab.
|
2015-02-26 15:32:10 -08:00 |
|
PsiOmega
|
98f6a4cae5
|
Camera coverage fixes.
Fixes issues with AI cameras coverage not updating properly in several instances during EMPs, destruction, etc.,
|
2015-02-26 11:39:41 +01:00 |
|
Chinsky
|
3ba56d7f76
|
Alt-arrow in same direction you are set to face now resets facing direction.
|
2015-02-26 11:56:43 +03:00 |
|
Zuhayr
|
a9d23df3ff
|
Merge pull request #8279 from PsiOmegaDelta/CameraNet
Fixes camera network changes not always being reflected in camera consoles.
|
2015-02-26 16:28:49 +10:30 |
|
PsiOmega
|
4dca85b17c
|
Fixes camera network changes not always being reflected in camera consoles.
Cameras with altered networks would not necessarily show up on camera consoles, primarily affecting cameras joining/leaving alarm zones.
|
2015-02-25 19:50:07 +01:00 |
|
PsiOmega
|
768faa4bf0
|
Fixes #8266.
Ensures drones get access to the alarm monitor subsystem.
Restores the Show Alerts link in alarm notices.
|
2015-02-25 09:07:04 +01:00 |
|
mwerezak
|
401709cd23
|
Merge remote-tracking branch 'upstream/dev-freeze' into gun-rewrite
|
2015-02-24 20:15:18 -05:00 |
|
mwerezak
|
5124055663
|
Fixes #8243
Didn't want to have to generate even more lists so this is what you get.
|
2015-02-24 19:42:24 -05:00 |
|
Zuhayr
|
ee0d63a43d
|
Merged with dev.
|
2015-02-24 17:03:39 +10:30 |
|
Chinsky
|
b73d541c65
|
Merge pull request #8155 from PsiOmegaDelta/subsystems
Centralized Alarm Handling
|
2015-02-24 04:39:48 +03:00 |
|
Zuhayr
|
09f15f98f2
|
Merge pull request #8215 from GinjaNinja32/language
Fixes a few issues with noise-language.
|
2015-02-24 07:49:37 +10:30 |
|
PsiOmega
|
d8245540ef
|
Restores silicon alarm notices.
|
2015-02-23 21:29:00 +01:00 |
|
GinjaNinja32
|
e47c45591c
|
Fixes a few issues with noise-language.
|
2015-02-23 18:58:41 +00:00 |
|
PsiOmega
|
1c763ff2c9
|
Merge remote-tracking branch 'upstream/dev' into subsystems
|
2015-02-23 10:32:32 +01:00 |
|
PsiOmega
|
5578afa07c
|
General update.
NanoUI interface sorted.
Accessible by AI, borgs, and through consoles.
Automatic alarm resets in case of lost sources.
|
2015-02-23 10:32:25 +01:00 |
|
PsiOmegaDelta
|
bbbde676d5
|
Merge pull request #8200 from mwerezak/devfixes
Misc dev updates
|
2015-02-23 10:15:42 +01:00 |
|
mwerezak
|
3ae3ef7961
|
Merge remote-tracking branch 'upstream/dev' into runtime
|
2015-02-22 21:13:20 -05:00 |
|
Chinsky
|
2d03c412f7
|
Merge pull request #8182 from Neerti/2_20_2015_examine_tab_refactor
Examine Tab 2: Revenge of the Refactor: Reloaded
|
2015-02-22 11:32:32 +03:00 |
|
Zuhayr
|
28e7411e2d
|
Merge branch 'dev' of https://github.com/Baystation12/Baystation12 into xenohydro
|
2015-02-22 16:28:06 +10:30 |
|
mwerezak
|
11719a380e
|
Fixes #8151
|
2015-02-21 15:49:52 -05:00 |
|
Zuhayr
|
e0267c4adf
|
Merge pull request #8194 from comma/gore
Surgery overlays
|
2015-02-22 01:00:47 +10:30 |
|
Chinsky
|
acfd99e33c
|
Surgery now shows up on mob, in all gory glory.
|
2015-02-21 16:31:44 +03:00 |
|
Zuhayr
|
14f8e3beac
|
Numerous kitchen changes in tandem with prior commit. Removed processor.
|
2015-02-21 22:24:01 +10:30 |
|
Zuhayr
|
0c206344b6
|
Master<dev
|
2015-02-21 19:57:31 +10:30 |
|