cyberpresidentvanellope/CHOMPStation2
1
0
Fork 0
mirror of https://github.com/CHOMPStation2/CHOMPStation2.git synced 2025-12-25 09:31:42 +00:00
Code Issues Packages Projects Releases Wiki Activity
25,691 Commits 8 Branches 0 Tags
037a901b2283018942f425e7347669597d571c4d
Commit Graph

10097 Commits

Author SHA1 Message Date
Zuhayr
b3102824a0 Fixes #9544 2015-05-31 03:56:06 +09:30
Zuhayr
ae38961a65 Fixes #9551 2015-05-31 03:36:07 +09:30
Zuhayr
f9e99e1ee9 Fixes #9581 2015-05-31 03:34:29 +09:30
Zuhayr
c2c8911aed Additional IPC tweaks. 2015-05-31 02:30:57 +09:30
Zuhayr
388b2612b0 Fixes #9488 2015-05-31 01:43:06 +09:30
Zuhayr
ff5c815d01 Fixes #9487 2015-05-31 01:38:04 +09:30
PsiOmega
d0232732d4 Merge remote-tracking branch 'upstream/dev-freeze' into dev 
Conflicts:
	code/game/machinery/floodlight.dm
	code/game/objects/items/devices/suit_cooling.dm
	code/modules/organs/subtypes/diona.dm
	code/modules/paperwork/pen.dm
	code/modules/reagents/reagent_containers/hypospray.dm
	html/changelogs/.all_changelog.yml
 2015-05-30 16:11:57 +02:00
PsiOmega
5e84bfa57c Merge remote-tracking branch 'upstream/master' into dev-freeze 
Conflicts:
	code/modules/clothing/spacesuits/rig/suits/ert.dm
 2015-05-30 15:59:54 +02:00
GinjaNinja32
94e19592cf objects/effects, objects/structures 2015-05-30 14:37:40 +01:00
GinjaNinja32
dfd871f168 code/machinery, fix for code/antagonist merge string causing false positive 2015-05-30 14:05:32 +01:00
PsiOmegaDelta
12d1277925 Merge pull request #9577 from Zuhayr/dev-freeze 
Fixes
 2015-05-30 08:35:39 +02:00
Zuhayr
eaf7e6718d Merge pull request #9553 from GinjaNinja32/reagent_protection 
Fixes #5945, de-copy-pastes parapens and sleepypens
 2015-05-30 13:57:31 +09:30
PsiOmega
bf27545841 End game turf changes now simply alters color. 2015-05-29 23:38:09 +02:00
GinjaNinja32
d09cd2fe57 Merge remote-tracking branch 'upstream/dev' into span_class=notice 
Conflicts:
	code/game/antagonist/station/rogue_ai.dm
	code/game/gamemodes/malfunction/Malf_Modules.dm
	code/game/jobs/job_controller.dm
	code/game/verbs/ooc.dm
 2015-05-29 21:55:37 +01:00
GinjaNinja32
de4f085057 code/game, excluding code/game/machinery and code/game/objects 2015-05-29 21:51:27 +01:00
Zuhayr
deb806c4cb Fixes #9076 2015-05-30 05:24:44 +09:30
Zuhayr
a3f3009eb4 Fixes #9063 2015-05-30 05:16:01 +09:30
Zuhayr
a4c2267984 Fixes #9386 2015-05-30 04:01:13 +09:30
Zuhayr
c5df326533 Fixes #9414 2015-05-30 03:15:19 +09:30
Zuhayr
887b8163cc Fixes #9498 2015-05-30 02:56:01 +09:30
Zuhayr
5a339a66c1 Fixes #9510 2015-05-30 02:52:16 +09:30
Zuhayr
d3b7bcc42e Fixes #9397 2015-05-30 02:41:13 +09:30
GinjaNinja32
cf722a2d34 Closes some span tags 2015-05-29 18:01:50 +01:00
Zuhayr
fa7c43bf39 Merge pull request #9549 from atlantiscze/bright-solution 
Refactor floodlights
 2015-05-30 02:11:10 +09:30
Zuhayr
b6ddafb476 Merge pull request #9502 from Kelenius/ofAIAndLooc 
AI now hears LOOC both around its eye and its core, and speaks in LOO…
 2015-05-30 02:10:25 +09:30
Zuhayr
3cf0018fb8 Fixing up bed icons etc. 2015-05-30 01:13:11 +09:30
Zuhayr
93aaa48cd8 Fixes #9571, various other tweaks. 2015-05-30 00:59:39 +09:30
Zuhayr
7d7723c19d Further material tweaks. 2015-05-30 00:45:58 +09:30
Zuhayr
e9f2f5cf55 Converted comfy chairs to material system, cleaned up colours/icons. 2015-05-30 00:45:36 +09:30
Zuhayr
15070d729d Dev-freeze into dev merge. 2015-05-30 00:31:12 +09:30
Atlantis
919c23d146 Adjustments 
- Implements AI Control for floodlights
- Adds \the suggestion from github
 2015-05-29 11:42:46 +02:00
GinjaNinja32
86f52910a1 Fixes #5945, de-copy-pastes parapens and sleepypens 
Harm-syringes, hyposprays, parapens and sleepypens now all respect armour, and produce admin logs for transferred reagents if any are transferred.
 2015-05-28 22:23:37 +01:00
Atlantis
30e4550e2e Refactor floodlights 
- Fixes #9543
- Removes ugly floodlight/proc/updateicon() and replaces it with proper floodlight/update_icon() which is standard on all objects/items. Does the same refactor for power cells and adjusts the proc call in relevant files (hence the amount of 1-line changes in various files)
- Makes floodlights properly use CELLRATE. Their load is 200 watts. Cell adjusted accordingly, it starts with 1k cell, which is enough for ~40 minutes (roughly)
- Floodlights with almost discharged cell (less than 10%) ocassionally "flicker", dimming for few seconds. This serves as indicator that the power cell is running low.
- Floodlight luminosity adjusted. They now shine slightly more, espicially closer to the floodlight.
 2015-05-28 21:45:54 +02:00
Atlantis
7981777c41 Merge branch 'dev-freeze' of https://github.com/Baystation12/Baystation12 into newmalf-merge 2015-05-28 20:16:12 +02:00
Kelenius
8a94211bb4 Chem puffs will now touch objects on tile before splashing on the mob 2015-05-28 18:29:07 +03:00
Atlantis
ccf9afb9cb Implements PsiOmegaDelta's suggestion (fixed edition) 2015-05-28 17:24:41 +02:00
Atlantis
a4c29238aa Refactors get_apc() 
- Fixes #9536
- Area now has APC variable, instead of list. APC construction, etc. should have checks to allow one APC per area only, so situations with multi-APC areas are unlikely, unless adminbus occurs. Either way, with or without this commit, one of the APCs would be unoperational (no load)
- get_apc() no longer uses very laggy locate() in contents of area. In situations where get_apc() is called repeately this brings massive increase in performance (from 0.120 to 0.000, depending on area size and amount of things in contents of that area) as it now only returns the apc variable.
 2015-05-28 17:11:26 +02:00
Yoshax
850301ed0f Fixes bluespace relay issues (being un deconstructable, and not building properly. 2015-05-28 03:56:53 +01:00
Zuhayr
5ea78421ff Merge pull request #9408 from mwerezak/sm-eject 
Limits the ability of the SM to return to the station zlevel once ejected
 2015-05-28 11:35:39 +09:30
Zuhayr
28265a3e2e Merge pull request #9457 from atlantiscze/satellite-solars 
Telecommunications Solar Arrays
 2015-05-28 11:34:09 +09:30
Kelenius
9a24b5b1cb AI now has a prefix, (Core) or (Eye), depending on where it hears LOOC 2015-05-27 21:13:34 +03:00
PsiOmegaDelta
414a4321fd Merge pull request #9496 from mwerezak/ivstand 
IV stands are no longer bullet shields
 2015-05-27 19:57:40 +02:00
Zuhayr
00ede5d475 Merge pull request #9477 from comma/dev-freeze 
Moved Captain's announcment out of equipping to spawning.
 2015-05-28 03:09:25 +09:30
PsiOmega
e0177765c6 Merge remote-tracking branch 'upstream/dev-freeze' into dev 
Conflicts:
	html/changelogs/.all_changelog.yml
 2015-05-27 17:52:55 +02:00
Kelenius
19aa1c0ae8 AI now hears LOOC both around its eye and its core, and speaks in LOOC around its eye 2015-05-27 13:14:22 +03:00
Chinsky
286e8c711a Merge pull request #9484 from Dennok/#9196 
Fix #9196
 2015-05-27 06:37:40 +03:00
Chinsky
8eb75ae398 Merge pull request #9480 from Kelenius/ofResearchAndRuntime 
Fixes #9473
 2015-05-27 06:36:50 +03:00
Chinsky
3d5b7e5744 Merge pull request #9464 from Kelenius/ofChemAndAnalyze 
Medical scanners now scan ingested reagents
 2015-05-27 06:32:20 +03:00
mwerezak
31b2ce9cf7 IV stand span classes 2015-05-26 23:07:21 -04:00
mwerezak
e510f6625f Fixes IV stands blocking bullets 
IV stands now check PASSTABLE, allowing projectiles and small mobs to
pass through them.

Flipped tables now block small mobs.
 2015-05-26 23:05:38 -04:00