cyberpresidentvanellope/CHOMPStation2
1
0
Fork 0
mirror of https://github.com/CHOMPStation2/CHOMPStation2.git synced 2025-12-15 20:52:41 +00:00
Code Issues Packages Projects Releases Wiki Activity
23,135 Commits 6 Branches 0 Tags
173f0527eb4c984b75d075fd31a588aadee054b3
Commit Graph

5033 Commits

Author SHA1 Message Date
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
mwerezak
1a4cedd412 Fixes #7363 2015-03-02 13:24:52 -05:00
PsiOmega
cf11fad8bc Merge remote-tracking branch 'upstream/master' into dev-freeze 2015-03-01 21:13:38 +01:00
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
Zuhayr
2ecd76b07f Master merge. 2015-02-21 19:51:28 +10:30
Zuhayr
2139884244 Dev merge. 2015-02-21 19:49:47 +10:30
Chinsky
81599a9203 Merge pull request #8175 from Kelenius/ofBorgsAndSynths 
Adds robot synths
 2015-02-21 11:43:39 +03:00
Chinsky
2b2332cfc1 Merge pull request #8157 from mwerezak/gun-rewrite 
Better handling of mob projectile passthrough and embedding + some gun tweaks
 2015-02-21 07:52:58 +03:00
Chinsky
6bd495fc47 Merge pull request #8164 from PsiOmegaDelta/NanoAir 
Air Alarm and Atmospheric Controller NanoUI
 2015-02-21 07:51:01 +03:00
PsiOmega
5b299e0104 NanoUI atmosphere control and remote air alarm support. 2015-02-20 17:39:55 +01:00
Zuhayr
31edc34a3d Merge pull request #8184 from Kelenius/ofDronesAndVerbs 
Axes drone verb category
 2015-02-21 02:32:30 +10:30
Kelenius
4aee297d2e Axes drone verb category 
Moves verbs to "robot commands"
 2015-02-20 17:21:12 +03:00
Neerti
3f16754e89 Third refactor for examine system! This time we go back to atom-var based system, but because strings are tabled, it's apparently okay. 
The entire system is now self-contained inside a module folder.
Also fixes a runtime I made because ghosts lack a mind (and so do I)
 2015-02-20 08:04:17 -05:00
Kelenius
a0b73140e9 Fixes for synths and decompiler 2015-02-20 13:32:10 +03:00
Kelenius
1c1e644f29 Adds robot synths 2015-02-19 21:04:27 +03:00
Chinsky
fde327a83c Merge pull request #8121 from Neerti/2_13_2015_examine_tab 
Adds the Examine Tab.
 2015-02-19 21:00:22 +03:00