Commit Graph
22879 Commits
Author SHA1 Message Date
Markolie 6a6f09ed36 Cargo interface overhaul 2015-08-24 19:20:20 +02:00
Fox-McCloud a53451c243 Merge pull request #1813 from TheDZD/muhcheens
Machine Upgrade Update
2015-08-23 00:35:18 -04:00
DZD ca7d069ef9 Fixes
- Adds proper open panel sprite for recycler and seed extractor (fun
fact, the default icon state for t he seed extractor is "sextractor").
- Adds ability to rotatethe eat direction of the grinder, sadly there
are no sprites to match. (Somewhat copy-pasta'ed from particle
accelerator code)
- Stops the grinder from eating pthings if it is unanchored.
2015-08-22 21:13:38 -04:00
Fox-McCloud 5c0e21377c Merge pull request #1817 from Markolie/ipcrev
Re-add proper IPC reviving, let IPC's change their monitor
2015-08-22 16:07:33 -04:00
Fox-McCloud 24617a3421 Merge pull request #1814 from Spacemanspark/master
Adds the ability to teleport to people who activate pAI cards.
2015-08-22 16:07:17 -04:00
Fox-McCloud ea119a98df Merge pull request #1811 from Markolie/DENIED
Add option to reject adminhelps
2015-08-22 16:06:58 -04:00
Fox-McCloud c65f47707b Merge pull request #1807 from Markolie/globalassetcache
Update start of game logging, add global asset cache
2015-08-22 16:06:04 -04:00
Fox-McCloud 76d1493601 Merge pull request #1825 from Markolie/admins
Readmin fix, antag age update
2015-08-22 16:03:42 -04:00
Markolie e2246d40c5 Missing comma 2015-08-22 21:55:54 +02:00
Markolie 8ffea8f731 Readmin fix, antag age update 2015-08-22 21:53:51 +02:00
TheDZD 89b34aae2c Merge pull request #1824 from tigercat2000/readable_sql
Make mysql save queries readable
2015-08-22 14:54:43 -04:00
DZD 9f6cc85d7a Bug fixes
- Fixes not being able to put multiple items into a processor.
- Fixes monkey recycler design having the same ID as the smartfridge.
2015-08-22 14:02:41 -04:00
Tigercat2000 a1d4358af7 Make mysql save queries readable 2015-08-22 08:49:42 -07:00
Fox-McCloud 03e9b2fa1c Merge pull request #1802 from TheDZD/touch-spell
Wizard Touch Attacks and Staff Fixes
2015-08-21 23:01:02 -04:00
Mark van Alphen f50ba2cd6b Merge pull request #1820 from Aurorablade/SecRecordText
[Text Edit] Crime is not a Disability
2015-08-22 02:16:34 +02:00
Aurorablade 2ad7168c6c changes disabilty to crimes 2015-08-21 20:08:32 -04:00
DZD 32c849a1d5 More buildables, some fixes, upgradable smartfridge
- Fuel is now available in the tier 4 reagent list for buildable chem
dispensers.
- Seed extractor, gibber, and recycler can be built, but having better
stock parts has no effect.
- Smartfridge can hold up to 1500 items by default instead of 999,
upgrading matter bin allows it to hold more.
2015-08-21 20:06:23 -04:00
Markolie 557c78c1c0 Remove double follow link 2015-08-22 01:14:10 +02:00
DZD 0965789925 Fix merge conflicts 2015-08-21 18:38:42 -04:00
DZD 47f81b4d6f Cloning pod and chem fixes 2015-08-21 18:29:25 -04:00
Fox-McCloud 64af990d63 Merge pull request #1806 from Markolie/nukegoesboom
Nuke update
2015-08-21 16:56:30 -04:00
Fox-McCloud e3318d5a29 Merge pull request #1804 from Markolie/ertb
ERT backpack update
2015-08-21 16:54:08 -04:00
Markolie 609c850d18 Re-add proper IPC reviving, let IPC's change their monitor 2015-08-21 19:52:03 +02:00
Markolie 9dfdd2932c Fix typo 2015-08-21 18:53:04 +02:00
Markolie aa9b5a6310 Implement /vg/'s global asset cache 2015-08-21 18:47:00 +02:00
Mark van Alphen f70f75704d Merge pull request #1796 from Fox-McCloud/detective-scanner
Detective Scanner Protolathe Production
2015-08-21 17:19:06 +02:00
Mark van Alphen 4e619f1e36 Merge pull request #1793 from Alex6511/master
Makes NT less awful
2015-08-21 17:18:53 +02:00
Spacemanspark 90b61adb23 Adds the ability to teleport to people who activate pAI cards.
We can do the same with posibrains, why not pAI's?
2015-08-20 22:34:50 -05:00
DZD afa978a002 Preserves sanity
Forgot to lower the PSHOOM_2 chance after hearing what the sound was,
whoops.
Some logging fixes too.
2015-08-20 21:38:00 -04:00
DZD 5ce49bb3b3 Machine Upgrade Update
- Partial port of tgstation/-tg-station#9813
2015-08-20 21:03:19 -04:00
Alex6511 45f6e2d34a Update event_container.dm 2015-08-20 19:48:02 -04:00
Alex6511 b70c46a3a4 Merge pull request #1 from Alex6511/Borer-Removal
Removes borer random event
2015-08-20 19:46:33 -04:00
Alex6511 481b13b32e Update event_container.dm 2015-08-20 19:46:05 -04:00
Mark van Alphen 34cc6b6278 Merge pull request #1810 from Spacemanspark/master
Making TullyBBurnalot happy (AKA the dumbest grammar PR ever.)
2015-08-20 23:33:27 +02:00
Markolie e6c331153a Add option to reject adminhelps 2015-08-20 23:33:09 +02:00
Spacemanspark 8d691a2944 Making TullyBBurnalot happy (AKA the dumbest grammar PR ever.)
Tully is a nerd.
2015-08-20 16:17:38 -05:00
Markolie fa55bc85f8 Baystation --> This server 2015-08-20 22:37:41 +02:00
Markolie f6c8358fa2 Fix reference to nuke 2015-08-20 21:57:41 +02:00
Markolie 175bea62ca only change alert level on non-syndi nukes 2015-08-20 21:25:07 +02:00
TheDZD a4ec672e6b Merge pull request #1809 from Markolie/master
Another dsay fix
2015-08-20 15:18:12 -04:00
Markolie eb2d2b6df9 Another dsay fix 2015-08-20 21:13:17 +02:00
TheDZD 3e50220b6f Merge pull request #1808 from Markolie/master
dsay fix
2015-08-20 15:04:18 -04:00
Markolie d556608225 dsay fix 2015-08-20 20:58:54 +02:00
Markolie ebe275a8a1 log_to_dd instead of world.log 2015-08-20 20:22:54 +02:00
Markolie 6c8efe9a9b Atmos --> Atmospherics 2015-08-20 20:08:58 +02:00
Markolie 4a0e02c4a8 Update start of game logging 2015-08-20 19:54:13 +02:00
Markolie 93e320c648 Add mob sprites to ERT backpacks 2015-08-20 19:33:35 +02:00
Markolie 4bd4452086 More nuke updates 2015-08-20 19:21:46 +02:00
Markolie 59a86e5711 Make nuclear bomb use wires datum 2015-08-20 18:47:19 +02:00
TheDZD 639478ace5 Merge pull request #1777 from Markolie/malf
Malf AI update
2015-08-20 11:50:19 -04:00