Commit Graph

18828 Commits

Author SHA1 Message Date
GinjaNinja32
81d23c85cc code/ATMOSPHERICS \red \blue etc to span classes 2015-05-29 19:36:15 +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
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
Zuhayr
c62514887b Merge pull request #9481 from PsiOmegaDelta/150526-Inactivity
Inactivity process tweaks.
2015-05-27 13:24:22 +09:30
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
Dennok
7edbd83ba6 Fix Emergency Floodlight
up
2015-05-26 14:31:44 +03:00
Chinsky
bae5bf8b4a Monkeys are scoopable again. 2015-05-26 13:44:01 +03:00
PsiOmegaDelta
2b749602c7 Merge pull request #9475 from Zuhayr/paiscoop
Allows pAIs to be scooped up and worn as hats.
2015-05-26 12:39:05 +02: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
Kelenius
f7814e2394 Fixes #9473
Also: removes automatic shuttle calls when callers are destroyed;
Applies qdel;
Fixes teleporter control console design that probably didn't work
before.
2015-05-26 09:58:25 +03:00
PsiOmega
62185bc0a8 Merge remote-tracking branch 'upstream/dev-freeze' into dev 2015-05-26 08:35:32 +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
Zuhayr
0104de03d4 Allows pAIs to be scooped up and worn as hats.
Readds missing monkey inhands
Standardized get_scooped() calls to mousedrop instead of attack_hand.
Changelog.
2015-05-26 15:15:15 +09:30
Zuhayr
1b4b428fe9 Removed several unneeded icons from inhands, split holder icons into their own file. 2015-05-26 14:05:21 +09:30
Zuhayr
7ab8a380bd Addendum to custom synth icon commit. 2015-05-26 14:04:51 +09:30
Zuhayr
46714274c3 Moved custom synth icons to the custom items repo. 2015-05-26 14:03:06 +09:30
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
PsiOmegaDelta
ccf5945944 Merge pull request #9362 from Kelenius/ofResearchAndPrototypes
Updates to science
2015-05-25 19:55:01 +02:00
Chinsky
d4eb0e82bb Merge pull request #9293 from RavingManiac/dev
Emote, say() and visible_message() refactor, tape recorder upgrade
2015-05-25 20:53:04 +03:00
Kelenius
ea12fc664f Merge branch 'dev' into ofResearchAndPrototypes
Conflicts:
	code/modules/mob/living/carbon/brain/posibrain.dm
2015-05-25 20:35:46 +03: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
PsiOmegaDelta
b934258adc Merge pull request #9458 from Zuhayr/ipc
Fixes IPC lack of frailty.
2015-05-25 09:43:20 +02:00
Zuhayr
76c3fecf9a Fixes IPC lack of frailty. 2015-05-25 17:07:04 +09:30
Zuhayr
f32a8493c8 Merge branch 'dev' of https://github.com/Baystation12/Baystation12 into posibrains 2015-05-25 16:50:04 +09:30
Zuhayr
88b3019e6c Adds ghost click to posibrains.
Added ghost trap system used by plants and posibrains to get players. Added attack_ghost() to hydro trays and posibrains for the aforementioned.
Changelog.
Minor typo.
Topic fixes.
Minor fix.
2015-05-25 16:49:22 +09:30
Zuhayr
d6e3df5fba Attempting to guarantee immunity to viruses for virus_immune var. 2015-05-25 15:52:51 +09:30
Zuhayr
74dfd82072 Organ cleanup, stat to DEAD, world removal 2015-05-25 14:50:02 +09:30
Zuhayr
7dd86c9147 Readded preview icon for IPC, added language and blurb.
Added welder/fuel checks to relevant surgery.
2015-05-25 14:50:00 +09:30
Zuhayr
f0006ec6bf Removes redundant surgery for brain and eye repair, now covered by organ repair in general.
Attempted to limit regular surgery to non-robotic limbs and added surgical steps for robotic limbs.
Readded checks for smoking reagent transfer.
Fixes, oversights, tweaks with IPC.
Added some reagent bypassing for NO_BLOOD and some checks to various affect_touch() calls for NO_SCAN/IPC.
Added prosthetic-scanning functionality to cyborg analyzer.
Added prosthetic analysis to the robot analyzer.
Allowed people with internal cells to charge in robot chargers (IPCs).
2015-05-25 14:49:57 +09:30
Zuhayr
aa97778f0a Fixes #9433 2015-05-25 14:49:07 +09:30
Zuhayr
958494ae75 Removed IS_SYNTHETIC and REGENERATES_LIMBS flags.
Moved some organ code around, added icons and limbs for IPC, added IPC limb manufacturer.
Reimplementing checks in place of IS_SYNTHETIC.
Rebalancing EMP a bit for IPC.
2015-05-25 14:49:07 +09:30
Zuhayr
3cae318716 Merge pull request #9370 from comma/frankenstein
Frankenstein
2015-05-25 13:56:40 +09:30
Atlantis
2f74a6d3c2 Telecommunications Solar Arrays
- Makes telecommunications solars actually work. They are connected into ring-shaped cable running around whole telecomms, powering single SMES unit which in turn powers the satellite itself.
- Installed solars have maximal combined output of 240kW. Real output fluctuates between 120kW and 160kW depending on star orientation.
- Fractal generator and relevant breaker removed. RCON control is still possible, by adjusting SMES settings.
2015-05-25 06:18:10 +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
Zuhayr
161af35d6c Merge pull request #9416 from Hubblenaut/dev
Makes mice pick up-able
2015-05-25 02:25:37 +09:30
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
Hubblenaut
7a8bbab694 fixup 2015-05-24 15:39:43 +02:00
PsiOmegaDelta
9a8a6a601b Merge pull request #9441 from GinjaNinja32/hardsuit_click
Changes hardsuit activation button to a per-client toggle.
2015-05-24 14:43:34 +02: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
GinjaNinja32
4bad50e875 Gives AI/borg previews back their cardborg hats 2015-05-23 20:42:51 +01:00