Erthilo
070cb50f8d
PDAs can be used when buckled (and not in any other way restrained or stunned). Rejuvenate now completely heals a target or broken organs and viruses too.
2013-08-11 17:13:58 +01:00
PlasticDingus
672a810f44
New decorative object
...
So having gotten a (weak) grasp of Git and and creating objects, I'm
submitting my first commit. It's a simple potted plant decorative
object.
If there's something wrong, please let me know. I'm still quite new to
contributing to the game.
2013-08-11 02:49:02 -04:00
Segrain
935a7f30ea
Typo fix.
2013-08-11 09:22:20 +03:00
Zuhayr
a8c892a938
Fixes Heist check_antag verb.
2013-08-11 14:03:46 -07:00
Zuhayr
9ee5d58ca6
Merge branch 'dev-freeze' of https://github.com/Baystation12/Baystation12
2013-08-10 12:24:33 -07:00
Segrain
1d533de46a
Vox limbs.
2013-08-10 06:16:47 +03:00
Zuhayr
4e5a17b94a
Lowered age for pod plants.
2013-08-10 00:20:09 -07:00
Zuhayr
bb06b50177
Merge branch 'master' of https://github.com/Baystation12/Baystation12
2013-08-09 13:21:54 -07:00
Segrain
907f9311ba
Vox flavor text.
2013-08-09 07:09:50 +03:00
Zuhayr
840468cb14
Fixed the order of update/return statements for dispenser.
2013-08-08 23:17:38 -07:00
Zuhayr
23301d9b73
Made dispensers unwrenchable.
2013-08-08 22:56:31 -07:00
Jim "Apples"
a3c4f43e82
Merge pull request #3459 from Mloc/probfix
...
Fix for autotraitor not working in secret probabilities.
2013-08-07 09:00:51 -07:00
Mloc-Argent
941f36ddec
Fix for autotraitor not working in secret probabilities. All modes default to 0 prob in secret now.
...
Signed-off-by: Mloc-Argent <colmohici@gmail.com >
2013-08-07 16:56:41 +01:00
Zuhayr
f2fdbc6c83
Merge branch 'master' of https://github.com/Baystation12/Baystation12
2013-08-07 21:30:45 -07:00
Zuhayr
52b9242c4f
Compile fixes, blah.
2013-08-07 11:19:31 -07:00
Zuhayr
0447a8e3e5
Adjusted monkeyizing/humanizing procs to use species properly.
2013-08-07 11:13:13 -07:00
Zuhayr
221324d29b
Merge branch 'master' of https://github.com/Baystation12/Baystation12
2013-08-07 00:25:53 -07:00
Segrain
81c8478e74
Fix for #3450 . Also, stuff.
2013-08-07 00:50:46 +03:00
Zuhayr
5d80ae657d
Merge pull request #3437 from Segrain/dev
...
Camera console controls.
2013-08-05 16:36:47 -07:00
Segrain
c0742c9ca3
Camera console controls.
2013-08-06 01:42:33 +03:00
Segrain
170c66ee8a
Fix for ERT spawning.
2013-08-06 01:30:49 +03:00
Zuhayr
98bbb095ad
Swapped languages and datums over to global lists. Updated verbs.
2013-08-05 20:34:38 -07:00
Zuhayr
520d1b34d2
Merge resolution.
2013-08-05 08:00:03 -07:00
Segrain
498f95929d
Maint_all_access and req_one_access.
2013-08-04 16:29:41 +03:00
Chinsky
c8cb496efa
Merge pull request #3427 from NicholasDV/keyCardAndRadStormAdditions
...
Key card and rad storm additions
2013-08-03 21:55:02 -07:00
NicholasDV
9f1ae93379
Made maintenance all access capable of being revoked...
...
Via the keycard authentication consoles.
2013-08-03 23:43:11 -04:00
Chinsky
5064989b26
Merge pull request #3423 from NicholasDV/ertChanges
...
ERT Changes
2013-08-03 14:47:43 -07:00
Segrain
f13c84ed04
Fix for power alarms cameras.
2013-08-04 01:05:50 +03:00
comma
e45f429e4c
Merge branch 'dev-freeze' of https://github.com/Baystation12/Baystation12
...
Conflicts:
code/modules/mob/living/silicon/robot/robot.dm
maps/tgstation.2.1.0.0.1.dmm
2013-08-04 01:40:32 +04:00
Zuhayr
81487c9cdb
Minor hair fix.
2013-08-04 01:50:00 -07:00
Zuhayr
b875ff021b
Vast array of changes to replace mutantrace with species datum
2013-08-03 15:08:54 -07:00
Zuhayr
0f0ac218b3
Commented out blob and wish granter.
2013-08-03 12:51:41 -07:00
Zuhayr
dec28dda86
Merge branch 'feature' of https://github.com/Zuhayr/Baystation12
2013-08-03 12:41:46 -07:00
Alex
35e7ec3228
Allow cyborgs to hack vending machines
2013-08-03 14:08:27 +02:00
NicholasDV
8da16aac47
Made admins able to override the 'can_call_ert' via force...
...
And removed a few // DEC I put in for being able to easily hop in the code.
2013-08-03 05:23:44 -04:00
NicholasDV
3e364635b2
Separated ERT from red alert and other small changes...
...
Separated the ERT to be callable via the keycard auth device.
Gave the ERT call different messages to work with the above, as well as a message when it has been denied.
The old base amount of 50 was way too stronk. Furthermore, it was added to by other factors from the game. It has been lowered a bit and a proc added in to increase it the longer the round has been going on.
Made it so that you may only attempt to call the ERT a single time.
Changed it so that you only have 5 minutes to join the ERT after it has been called.
2013-08-03 05:13:28 -04:00
Zuhayr
27f7d1580d
Merge branch 'feature' of https://github.com/Zuhayr/Baystation12
2013-08-02 20:16:50 -07:00
Zuhayr
37f134ec42
Corruption fix - we had way too many strings somehow.
2013-08-02 20:14:20 -07:00
Zuhayr
a470444963
TEMPORARY fix for the too-many-strings RSC corruption issue.
2013-08-03 09:21:53 -07:00
Zuhayr
618afa1be7
Merge branch 'dev' of https://github.com/Baystation12/Baystation12
2013-08-03 09:16:41 -07:00
Zuhayr
a8c04cefc6
Merge.
2013-08-03 09:14:20 -07:00
Segrain
cf5d3f9a2e
Variable inject amounts for sleepers.
2013-08-02 19:34:10 +03:00
Segrain
d51809faa2
Separating autoinjectors box from injector box.
2013-08-02 19:30:02 +03:00
Segrain
dd3a8fc568
Advanced medical equipment for NanoMeds.
2013-08-02 19:27:23 +03:00
Segrain
c2712dd9d3
Fix for #3410 .
2013-08-01 20:58:35 +03:00
comma
95f00d0523
Merge branch 'dev' of https://github.com/Baystation12/Baystation12 into medtweaks
2013-08-01 10:03:46 +04:00
comma
bbdcb81868
Added advanced medikits.
2013-08-01 09:58:09 +04:00
comma
c8f5b98a95
Autoinjectors.
...
Now they are one-use, as they were intended.
You can still change their contents with syringes before they are used.
To mitigate their one-use nature, box of them is added to medical closets and supply pack.
2013-08-01 08:12:56 +04:00
Zuhayr
b4e8c60472
Merge resolution.
2013-07-31 19:21:58 -07:00
Zuhayr
8008a27ec4
Merge branch 'dev' of https://github.com/Baystation12/Baystation12
2013-07-31 18:54:45 -07:00
