Commit Graph
6993 Commits
Author SHA1 Message Date
Chinsky a29e52b10c Stopped braindamage effect from dealing 4 digit amounts of damage to brain organ. 2014-03-09 22:32:17 +04:00
Chinsky 16ab0c9885 Fixes single pane windows not blocking airborne viruses completely. 2014-03-09 22:07:07 +04:00
Chinsky c58314bae3 Merge branch 'dev' into virus-racism
Conflicts:
	code/modules/virus2/helpers.dm
2014-03-08 12:04:17 +04:00
Chinsky 52ad2bc4fb Merge branch 'dev' of https://github.com/Baystation12/Baystation12 into dev 2014-03-08 12:03:27 +04:00
Chinsky cca2c997df Merge branch 'master' into dev 2014-03-08 12:02:32 +04:00
Chinsky 4dba89a288 Fix for #4542
Now synthetics do not contract viruses
2014-03-08 03:38:30 +04:00
Chinsky c906fbf7dd Added system for viruses to affect only certain species.
Currently it ignores synthetic species competely.
2014-03-08 03:32:10 +04:00
Chinsky 3554a7be4f Merge pull request #4535 from Mloc/bs12-'
Fix for apostrophes in IRC nudge.
2014-03-07 17:32:26 +04:00
RavingManiac b969e680b2 Ingested acid and mutagen will now react after the ten second delay. 2014-03-06 20:20:15 +08:00
RavingManiac f022a19452 Merge branch 'dev' of https://github.com/Baystation12/Baystation12 into dev
Conflicts:
	maps/tgstation2.dmm
2014-03-06 19:22:06 +08:00
Mloc-Argent 63a27890fe Fix for apostrophes in IRC nudge.
Signed-off-by: Mloc-Argent <colmohici@gmail.com>
2014-03-06 09:36:58 +00:00
Mloc 08ba326878 Merge pull request #4532 from Ccomp5950/apc_breaker
APC overlay bugfix.
2014-03-06 09:09:48 +00:00
Mloc 16b1626b57 Merge pull request #4525 from Ccomp5950/pda_nano
PDA NanoUI Optimizations.
2014-03-06 09:09:05 +00:00
Ccomp5950 a379be8a55 Merge pull request #4533 from DJSnapshot/hotfix
Non-whitelisted IPCS. The real fix this time.
2014-03-06 02:22:41 -06:00
DJSnapshot 89114787e3 Non-whitelisted IPCS
Had to do a hacky fix. there was no real way around it.
Also, a couple balances with IPCs
And a totally silly death animation (Which has been commented out for now)
2014-03-05 23:44:03 -08:00
RavingManiac 3b2d3eba05 trans_to_ingest now used for consumption of food, drink and pills instead of trans_to. This adds a ten second delay between ingestion and addition of the reagents to the body. 2014-03-05 23:41:42 +08:00
Ccomp5950 e8d04262a5 Merge pull request #4524 from Ravensdale/PROTECITON
Define spelling correction
2014-03-04 23:11:43 -06:00
Ccomp5950 74a8fa152c APC overlay bugfix.
Before: If you turned off the breaker and fiddled with on/off states and turned on the breaker it wouldn't update the overlay because the check_updates wasn't doing an if(operating) check and would think it didn't need to update the overlays once you turned on the breaker.

After: Check_update() is doing a check for the breaker being on or off and taking that into account with the update_overlay flags and will update the overlays properly.

Thanks Razharas from /tg/ #coderbus for bringing this to my attention.
2014-03-04 20:57:40 -06:00
Ccomp5950 c066232ab3 Merge branch 'master' of github.com:Baystation12/Baystation12 into dev 2014-03-04 18:29:03 -06:00
RavingManiac 727b87730b Smartfridge variations added to chemistry, bar and virology. One of the virology windows didn't have sides, so I fixed that. 2014-03-05 00:03:57 +08:00
Chinsky 98b45e52ac Merge pull request #4518 from yashaldie/master
fixes IPC brain surgery
2014-03-04 18:18:33 +04:00
Chinsky 8fa689a433 Merge pull request #4521 from Mloc/bs12-bloodyipcs
Dionaea can no longer steal blood from species which have the NO_BLOOD flag
2014-03-04 18:18:10 +04:00
Chinsky 557f8c7e92 Merge pull request #4526 from Mloc/bs12-libnudge
Adds a C library alternative to the ircbot nudge script.
2014-03-04 18:13:48 +04:00
Vetinari 1d62ceddaa Merged Upstream
This is a big one.
2014-03-04 22:19:09 +11:00
Mloc f4ca9631b5 Merge pull request #4504 from MrLeebo/severed-limbs-drop-cuffs
Fractures and severed limbs cause cuffs to fall off
2014-03-04 10:15:42 +00:00
Mloc 8d048c0179 Merge pull request #4519 from Furlucis/master
Meat cutting fix
2014-03-04 10:14:55 +00:00
Mloc-Argent 49890421f8 Adds a C library alternative to the ircbot nudge script.
This allows for more secure and stable transmission on Linux, but you might see some improvements on Windows too.
Code lies in (confusingly) lib/src.
nudge.c should be compiled to lib/nudge.[dll/so] and be linked against netutil.c.

There's some horribly hacky code in nudge.c to assemble pickled data, but it's probably the fastest way that's still safe.

Signed-off-by: Mloc-Argent <colmohici@gmail.com>
2014-03-04 10:08:17 +00:00
Ccomp5950 aa9141fb75 NanoUI Optimizations.
We won't regenerate the list for Manifests every tick while viewing the manifest, instead we have a global variable for it PDA_Manifest that we Cut() if there is a change to the manifest then when the next player goes to view the manifest on their PDA it will recreate the list that one time.

Some sections of the PDA will no longer auto-refresh every tick because...well that's dumb.

Modes that will no longer autoupdate at all:  Viewing medical/sec records, viewing notes (will update when you change them of course), and the station alert menu.
Modes that will only autoupdate every 5 ticks:  APC list (Because it's a huge fuck off list), the manifest, mulebots and secbots screens, supply requests/orders, and janitor supply locator)

Some other things that I just can't remember right now.
2014-03-03 22:50:24 -06:00
Ravensdale 9561635942 Merge branch 'dev' of https://github.com/Baystation12/Baystation12 into PROTECITON 2014-03-03 20:26:58 -08:00
Ravensdale 50a45b32ae Fixes a define spelling error. 2014-03-03 20:23:21 -08:00
Mloc 4ddd799359 Merge pull request #4505 from Ccomp5950/ert_admin_only
Configuration option:  Ability to set ERT to be admin call only.
2014-03-03 19:21:05 +00:00
Mloc-Argent 8deed8dddd Dionaea can no longer steal blood from species which have the NO_BLOOD flag
Fixes #4510

Signed-off-by: Mloc-Argent <colmohici@gmail.com>
2014-03-03 09:15:35 +00:00
Furlucis 01e66b6733 Meat cutting fix
The other kind of knife actually exists. This one doesn't.
2014-03-03 02:26:04 -05:00
yashaldie 61a4e37466 fixes IPC brain surgery
could not start the brain surgery on IPCs this should fix it
2014-03-03 01:18:31 -05:00
Jeremy Liberman d41d3b2b9e Fixes UI glitch when losing cuffs from fractures, resisting, or cult magic 2014-03-02 15:08:55 -06:00
Joey Haas 787ea32360 Added 3D glasses to Dormitory 2014-03-02 21:31:46 +01:00
Mloc 37112105f6 Merge pull request #4499 from Ccomp5950/runtime_fixs
Runtime fix: Depth scanner now won't check the length of null lists.
2014-03-02 19:56:23 +00:00
Ccomp5950 8f2d5e817f Configuration option: Ability to set ERT to be admin call only.
Admin request.

Default behavior is what we're used to, that two heads can call for the ERT
with the option turned on it removes the ability for players to call for an ERT and requires admin intervention.
2014-03-02 06:20:26 -06:00
Jeremy Liberman 4025ccbee5 Fractures and severed limbs cause cuffs to fall off. Deranged spessmen can chew their own wrists to break free. 2014-03-01 22:56:47 -06:00
Ccomp5950 5c482f1c8c Merge pull request #4494 from yashaldie/master
Fixed Borg toggling broadcast mode
2014-03-01 11:07:41 -06:00
Ccomp5950 77767db800 Merge pull request #4487 from zekesulastin/laser-scalpel
Laser Scalpels Ver. 1
2014-03-01 10:55:18 -06:00
Mloc c8f2d85b41 Merge pull request #4493 from Loganbacca/baytweak
Little things
2014-03-01 15:52:03 +00:00
Ccomp5950 5146268253 Runtime fix: Depth scanner now won't check the length of null lists.
runtime error: Cannot read null.len
proc name: scan atom (/obj/item/device/depth_scanner/proc/scan_atom)
  source file: tools_depthscanner.dm,31
  usr: Some Guy (/mob/living/carbon/human)
  src: the depth analysis scanner (/obj/item/device/depth_scanner)
  call stack:
the depth analysis scanner (/obj/item/device/depth_scanner): scan atom(Some Guy (/mob/living/carbon/human), Rock (155,169,5) (/turf/simulated/mineral))
Rock (155,169,5) (/turf/simulated/mineral): attackby(the depth analysis scanner (/obj/item/device/depth_scanner), Some Guy (/mob/living/carbon/human))
Some Guy (/mob/living/carbon/human): ClickOn(Rock (155,169,5) (/turf/simulated/mineral), "icon-x=23;icon-y=13;left=1;scr...")
Rock (155,169,5) (/turf/simulated/mineral): Click(Rock (155,169,5) (/turf/simulated/mineral), "mapwindow.map", "icon-x=23;icon-y=13;left=1;scr...")
2014-02-28 23:03:10 -06:00
DJSnapshot 1e186839c6 added IPCs(machines) to list to make it easier on everyone. 2014-02-28 17:36:50 -08:00
DJSnapshot 3b10ee3ad5 Removing IPC whitelist requirement. 2014-02-28 17:32:29 -08:00
DJSnapshot acdbb3573a Changed supermatter messages to reflect what they actually mean. 2014-02-28 15:28:11 -08:00
yashaldie 96dc185fde Update robot_modules.dm 2014-02-28 04:42:27 -05:00
yashaldie 36b4af57f2 made module contain channel list 2014-02-28 04:40:36 -05:00
Loganbacca 8e1b286a84 Mining drill text
- Adds drill_verb variables to pickaxe subtypes, so drills will now be described as "drilling" instead of "picking"
2014-02-28 12:15:41 +13:00
Loganbacca fbfdccebaf Suit sensor toggle
- Changes the suit sensor toggle verb to select from a list, instead of cycling through one mode at a time.
2014-02-28 12:15:26 +13:00