Commit Graph

12406 Commits

Author SHA1 Message Date
yashaldie
67dfe13034 Fix for O2 wall lockers breaking
Fixes #4538
also found when you tried to weld it it would break the sprite also
made the toggle verb just call the attack_hand proc to remove some items from the locker.
2014-03-07 05:43:31 -05:00
yashaldie
421b1ea6ef Fixes for slime surgery runtime
don't know why the slime is coming though even though the target is supposed to be human...
2014-03-07 04:56:49 -05:00
yashaldie
69dfb92719 Fixes for slime surgery runtime
don't know why this works but it does and doesn't break other surgeries from what i can tell
2014-03-07 04:55:23 -05: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
Joey Haas
2063909ab0 Fixed the bug where mech fabricators would get stuck whenever the RnD console was not found. 2014-03-04 23:51:12 +01:00
Joey Haas
844a856281 Fixed some machinery frames saying they need Manipulators instead of Micro Manipulators. 2014-03-04 19:36:55 +01: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
367b0190cb Merge pull request #4514 from JoeyJo0/3dglasses
Added 3D glasses to dormitory.
2014-03-04 10:14:47 +00:00
Mloc
5d1b4851e4 Merge pull request #4520 from alex-gh/cryopod_fix_bs12
Despawning in cryo pods no longer prematurely end rev rounds.
2014-03-04 10:13:58 +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
Jeremy Liberman
c5261a2796 Wearing masks or straight jackets blocks chewing on your wrists 2014-03-03 20:24:09 -06: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
alex-gh
1c596f2ff2 Despawning in cryo pods no longer prematurely end rev rounds. 2014-03-03 08:57:46 +01: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
DJSnapshot
8abbd52703 Merge pull request #4506 from Mloc/bs12-wtfaccess
Optimizes /obj/New() by removing access generation
2014-03-02 15:48:12 -08: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
5b633a1d9a Added '50 Wooden Planks' to shipments 2014-03-02 21:35:10 +01:00
Joey Haas
787ea32360 Added 3D glasses to Dormitory 2014-03-02 21:31:46 +01:00
Aryn
b5bdfc27b0 Set lighting overlay's name to empty string. 2014-03-02 13:11:14 -07: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
Mloc-Argent
d53263a49b Optimizes of /obj/New(), by removing access generation.
Previously, every single /obj would parse the req_access_txt and req_one_access_txt strings and turn them into a list of numbers for the access system.
This is now done the first time check_access() is called, so only objects that actually use the system will have the lists generated.

Signed-off-by: Mloc-Argent <colmohici@gmail.com>
2014-03-02 15:12:56 +00:00
Aryn
7947523b04 Fixed some bugs regarding space lighting. 2014-03-02 07:27:33 -07:00
Aryn
2c947e135f Fixed supply shuttle bug wherein the area types were actually tags. 2014-03-02 06:53:11 -07: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
Mloc
1b8eb18450 Merge pull request #4497 from Ccomp5950/sort_files
Server log files are now sorted when using .getruntimelog or .getserverlog
2014-03-02 10:54:51 +00: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
Aryn
b357344bf3 Temporary commit to back up data. 2014-03-01 14:43:39 -07:00
ZomgPonies
61fe10fe3d Efficiency: Joblist
Conflicts:
	code/__HELPERS/global_lists.dm
2014-03-01 13:38:55 -05:00
Ccomp5950
5c482f1c8c Merge pull request #4494 from yashaldie/master
Fixed Borg toggling broadcast mode
2014-03-01 11:07:41 -06:00