cyberpresidentvanellope/CHOMPStation2
1
0
Fork 0
mirror of https://github.com/CHOMPStation2/CHOMPStation2.git synced 2025-12-14 12:13:06 +00:00
Code Issues Packages Projects Releases Wiki Activity
23,224 Commits 8 Branches 0 Tags
69a080e2d611c6d45cb157861cade41f05d23721
Commit Graph

9148 Commits

Author SHA1 Message Date
Zuhayr
a72b94e3f8 Merge pull request #8432 from PsiOmegaDelta/WanderingNano 
Fixes #8264
 2015-03-11 08:08:04 +10:30
PsiOmega
373921fa44 Fixes #8264. 
updateUsrDialog() doesn't play well with nanoUI, forcing it to re-open and reposition on each cal.
 2015-03-10 14:06:05 +01:00
PsiOmega
533ccef0ab Robot code clean up and fixes. 
Fixes runtime when a borg is reset.
Fixes issue where /proc/select_active_ai_with_fewest_borgs() would not always return the intended AI.
Fixes issues with new borgs spamming the master AI with creation messages under some circumstances.
 2015-03-10 13:37:20 +01:00
PsiOmega
d3d9e0b2ed Merge remote-tracking branch 'upstream/master' into dev-freeze 2015-03-10 12:48:27 +01:00
Zuhayr
34c015cbbe Merge pull request #8424 from mwerezak/exosuit 
Allows removing exosuit pilots using maintenance protocols
 2015-03-10 18:54:07 +10:30
PsiOmega
9fdd3ccbdf Can now destroy/delete the suit cycler. 2015-03-10 09:08:52 +01:00
PsiOmega
85641b46e5 Merge remote-tracking branch 'upstream/master' into dev-freeze 2015-03-10 07:58:25 +01:00
mwerezak
3de6374b4a Allows unconscious/dead exosuit pilots to be removed if maintenance protocols are enabled. 
Enable maintenance protocols -> wrench -> crowbar -> multitool.
 2015-03-10 02:47:54 -04:00
Zuhayr
277ceea894 Merge pull request #8405 from PsiOmegaDelta/StationAlertRuntime 
Station Alert Runtime Fix
 2015-03-10 09:30:57 +10:30
Zuhayr
fb56784fcb Merge pull request #8408 from mwerezak/examine-fix 
Examine fix
 2015-03-10 09:30:51 +10:30
Zuhayr
00976aea43 Merge pull request #8417 from PsiOmegaDelta/SolidMatter 
Attemps to fix #8390 + solid bonus
 2015-03-10 09:29:04 +10:30
Zuhayr
fc985c2a27 Merge pull request #8416 from PsiOmegaDelta/Ninjas 
Fixes ninja spawn logic.
 2015-03-10 09:27:11 +10:30
Daniel García Baldomir
2fa6bb9ab2 Fixes mass driver not being registered on machines. 2015-03-09 21:54:38 +01:00
Chinsky
7a066b3c69 Merge pull request #8418 from mwerezak/supply-pack 
More tweaks
 2015-03-09 23:28:15 +03:00
PsiOmega
baed39c263 Attempts to fix persistent station alarms. Makes wardrobes solid. 2015-03-09 20:55:05 +01:00
mwerezak
b9d2517d83 Tweaks random gun spawners and supply packs 
laser carbines and laser pistols spawn in the armoury with equal
probability.
Stunshells are now rare like they should be.
Shotgun crates now have two combat shotguns, as they are less likely to
spawn in the armoury anyways.
Weapons crate comes with laser pistols, energy weapons crate comes with
laser carbines. Seemed more consistent that way.
 2015-03-09 15:47:25 -04:00
Chinsky
d433ccead2 Merge pull request #8412 from Neerti/3-9-2015_air_alarm_nano_shrink 
Makes the width of the nanoUI for air alarms smaller.
 2015-03-09 22:13:19 +03:00
Chinsky
ec9511c943 Merge pull request #8402 from PsiOmegaDelta/RemoteAir 
Fixes various alarm issues.
 2015-03-09 22:07:02 +03:00
PsiOmega
57c0591283 Fixes ninja spawn logic. 
Fixes the logic I re-made after a PR comment without double-checking it.
Changes ninjastart to use the actual landmarks instead of locs for consistency.
 2015-03-09 19:22:07 +01:00
mwerezak
b60a045d70 Fixes door runtime, removes user = null hack 2015-03-09 12:43:10 -04:00
mwerezak
385ff4f2fa Examine tab modularity 
Also fixes antag info text sticking around if antag/observer status is lost
 2015-03-09 12:09:18 -04:00
mwerezak
26cb0fe2c6 Fixes medical records laptop runtime 2015-03-09 12:04:04 -04:00
Neerti
c03535f03d Makes the width of the nanoUI for air alarms smaller. 2015-03-09 11:07:21 -04:00
PsiOmega
6cca0b6169 Station Alert Runtime Fix 
Fixes an issue where station alert consoles could potentially runtime due to alarm_monitor not yet being initialized.
 2015-03-08 23:02:29 +01:00
PsiOmega
e05e024cc5 Fixes issues with remote air alarm access. 2015-03-08 18:31:59 +01:00
PsiOmega
cfbba5c153 Station alert monitor should now only react to major alarms. 2015-03-08 17:58:48 +01:00
PsiOmega
d290ee4c68 Fixes #8398. 
Cryopods/cells that contains mobs will now drop them to the ground on deletion.
 2015-03-08 13:22:45 +01:00
Zuhayr
1984ef6e51 Master into dev-freeze. 2015-03-07 11:33:39 +10:30
Chinsky
36233b72e2 Merge pull request #8367 from mwerezak/cult-conversion 
Improves cult conversion
 2015-03-06 11:57:03 +03:00
mwerezak
32ee4d57dd Improves cult conversion 
Now uses a continuous damage system, dealing damage once every 100 ticks (~10 seconds).
Also improves effects dealt when resisting conversion.
 2015-03-05 23:58:56 -05:00
Daniel García Baldomir
429b35b526 Removed auto_use_power from process. 2015-03-06 00:05:22 +01:00
Daniel García Baldomir
73ca3b0656 Fixed holosign not being registered as machine. The master controller does not find you worthy of the machines list if you don't process. 2015-03-05 23:30:06 +01:00
PsiOmega
bdd84767d1 AI can now track people holding up objects to the camera. 2015-03-05 22:28:22 +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
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
Raptor1628
cf0e526d91 Fixes and adjustments 
Moves a few things around in the armory again, tasers back in lockers,
guns in officer access area of the armory. Re-adds the tacknife after it
was lost in the hydro merge, gives EMTs access to medical lockers.
 2015-03-04 11:18:40 -05:00
PsiOmega
8feec5760f Fixes #8342. 
Secbots now continually checks if their target remains in sight before bashing the head in.
 2015-03-04 16:54:07 +01:00
PsiOmega
8f929331d8 Fixes #8343 
Fuel no longer attempts to spread itself after having been deleted.
 2015-03-03 15:33:15 +01:00
PsiOmega
a11c7ba1c7 Fixes #8334. 
Removes references to the load_speed argument in load_map as it doesn't actually exist.
For some reason the dmm_suit injects itself as an argument in airlocks. Putting a band-aid on the symptom.
 2015-03-02 11:42:40 +01:00
Zuhayr
0beb6259f6 Partial fix for #8068. 2015-02-28 17:29:26 +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
4b15f1a249 Fixes #7877 2015-02-28 16:47:41 +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
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
Mustafa Kalash
d258a476f8 Adds paramedic to the medical category. Fixes #8255 2015-02-26 16:37:27 -05:00
Chinsky
9e07708cb3 Fixes #8241 rollerbeds not collapsing due to a runtime 2015-02-26 14:41:31 +03: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
100d8e9fb8 Fixed buckling into chair not changing mob's facing if he had permafacing set. 2015-02-26 12:09:23 +03:00