Commit Graph

18801 Commits

Author SHA1 Message Date
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
GinjaNinja32
daff60f8e3 Merge pull request #9563 from mwerezak/malflimb
Adjusts malfunctioning limb stance damage
2015-05-29 17:48:18 +01:00
Zuhayr
6e1d39ba2e Merge pull request #9554 from GinjaNinja32/nano_template
Fixes #6077
2015-05-30 02:16:32 +09:30
Zuhayr
fa7c43bf39 Merge pull request #9549 from atlantiscze/bright-solution
Refactor floodlights
2015-05-30 02:11:10 +09:30
GinjaNinja32
76daebe0db More consistent logging via admin_inject_log proc 2015-05-29 16:57:42 +01:00
Atlantis
477204e8c8 Fixes two newmalf-related issues
- Fixes APC runtime. I am an idiot. I know.
- Fixes potentional power issue with AI powersupply object, caused by AI having more than one powersupply. This sometimes caused AI to use 100kW instead of 50kW
2015-05-29 12:23:39 +02:00
Atlantis
919c23d146 Adjustments
- Implements AI Control for floodlights
- Adds \the suggestion from github
2015-05-29 11:42:46 +02:00
mwerezak
ad5c5680a2 Adjusts malfunctioning limb stance damage 2015-05-28 22:57:36 -04:00
GinjaNinja32
8ed2380cee Fixes #6077
Updates nanomanager's handling of opening UIs so that it can be called multiple times, changes force_open to simply ignore that the UI is open and try to open it again. Causes a slight flicker if the UI is open, but the window does not move or change size.
2015-05-28 22:55:46 +01: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
GinjaNinja32
42623947e1 Merge pull request #9539 from atlantiscze/get-apc-refactor
Refactors get_apc()
2015-05-28 19:11:36 +01: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
Kelenius
f2c0cb483d Fixes skrell and dionaea alcohol resistance/weakness 2015-05-28 08:49:58 +03:00
PsiOmegaDelta
928722c08a Merge pull request #9526 from Raptor1628/dev-freeze
Rig Icon Fixes
2015-05-28 07:06:02 +02:00
Raptor1628
62ef32a725 Rig Icon Fixes
Fixes some incorrect names that were resulting in broken icons.
2015-05-27 23:32:27 -04:00
Yoshax
850301ed0f Fixes bluespace relay issues (being un deconstructable, and not building properly. 2015-05-28 03:56:53 +01: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
PsiOmegaDelta
9ccb2d4f61 Merge pull request #9499 from mwerezak/robolimbs
Robolimb fixes
2015-05-27 19:57:08 +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
mwerezak
b4adb1a432 Updates species checks 2015-05-27 01:34:50 -04:00
mwerezak
7dcc98e1a4 Fixes robotic organs causing pain messages
Also fixes pain() not checking if the species has NO_PAIN.
2015-05-27 01:15:55 -04:00
mwerezak
68e205e7b3 Fixes robot limbs spamming sparks and messages endlessly
Fixes robot limbs spamming malfunctioning messages and spark effects
endlessly if one arm is malfunctioning while holding an item in the
other arm.
2015-05-27 01:15:14 -04:00
mwerezak
7d4c3235dc Fixes #9460 2015-05-27 01:13:53 -04:00
Zuhayr
c62514887b Merge pull request #9481 from PsiOmegaDelta/150526-Inactivity
Inactivity process tweaks.
2015-05-27 13:24:22 +09:30
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
PsiOmega
98c585615e Inactivity process tweaks.
Partially by request:
The inactive check process now respects client holder status and can be configured how long clients may remain inactive before being kicked.
2015-05-26 09:04:26 +02:00
PsiOmega
5a1bf5a6a4 Merge remote-tracking branch 'upstream/master' into dev-freeze
Conflicts:
	code/game/objects/items/toys.dm
2015-05-26 08:26:48 +02:00
Ccomp5950
fff9e5ec92 Merge pull request #9463 from PsiOmegaDelta/SinfulLiving
Fixes #9461.
2015-05-26 02:11:31 -04:00
Chinsky
f1c194d5e9 Moved Captain's announcment out of equipping to spawning. Removed redundant satchel spawning things - they are being taken care of in job's equip() 2015-05-26 09:11:04 +03:00
StarSmasher
711ad88903 Fixes #9294
Adding 6 tomato juice to 50 protein doesn't really work if the maximum is 50.
Also fixed it in the vegetable pizzas.

Figured a quickfix would be better than a very delayed fix.
2015-05-25 22:26:55 +02:00
Kelenius
359e055463 Lets medical scanners scan stomach 2015-05-25 19:11:14 +03:00
PsiOmega
4956af8597 Fixes #9461.
Corrects the path of the uplink item.
2015-05-25 17:59:41 +02:00
mwerezak
c08774d96e Updates bear traps
Moves to trap.dm.
Cleans up trap attacking code.
Fixes trap remaining anchored once triggered.
Instead of embedding, traps now buckle their victim into place.
Deaf messages, where appropriate.
Gave beartraps a more setting-friendly name.

Conflicts:
	baystation12.dme
2015-05-24 16:33:41 -04:00
Atlantis
1da44dc861 Merge branch 'dev-freeze' of https://github.com/Baystation12/Baystation12 into newmalf-merge
- Merge resolution: Updates intellicard NanoUI to correctly show separate hardware integrity/backup capacitor percentages.
2015-05-24 20:23:46 +02:00
Chinsky
b01c3a4ba9 Merge pull request #9451 from PsiOmegaDelta/Tmp
Fixes #9447.
2015-05-24 18:16:08 +03:00
Chinsky
7835afc361 Merge pull request #9450 from mwerezak/workboots
Adds engineering workboots
2015-05-24 18:16:00 +03:00
PsiOmegaDelta
3d9aa48f49 Merge pull request #9442 from GinjaNinja32/shuttle
Supply shuttle and crate fixes
2015-05-24 14:43:15 +02:00
PsiOmegaDelta
2fc50e7d03 Merge pull request #9449 from mwerezak/airlock-sound
Airlock sounds
2015-05-24 14:43:09 +02:00
PsiOmega
c21a456379 Fixes #9447.
The inteliCard now has a NanoUI interface, allowing it to utilize custom CanUseTopic() checks depending on context, in-hand or in-rig.
2015-05-24 11:33:54 +02:00
mwerezak
b4c88c6186 Adds engineering workboots
Sprites credit ChessPiece.
2015-05-23 23:00:26 -04:00
mwerezak
e6be73ac56 Airlock sounds 2015-05-23 22:59:18 -04:00
Atlantis
c2c3a2c689 Implements remaining suggestions
- Few more grammar fixes
- Machine overload adjustment finished. SMESs and APCs now receive explosion intensity bonus according to stored charge.
- Gets rid of remains of old "src:" references in AI Life() proc
2015-05-24 03:05:27 +02:00
Atlantis
da22851ff7 Merge branch 'newmalf-merge' of https://github.com/atlantiscze/Baystation12 into newmalf-merge 2015-05-24 01:16:09 +02:00
Atlantis
ef040583c8 Implements github suggestions
Among others:
- TXT helpfile is now HTML helpfile
- Lots of gremmer changes
- Some adjustments
2015-05-23 22:22:38 +02:00
Atlantiscze
5aa37bd859 Merge branch 'newmalf-merge' of https://github.com/atlantiscze/Baystation12 into newmalf-merge 2015-05-23 21:22:23 +02:00