a67d8339b7
Merge pull request #8414 from phil235/TablecraftVarietyFix
...
Fixes not being able to tablecraft recipes using differen kinds of an item
2015-03-22 05:32:43 +03:00
5261040cdf
Update Chemistry-Machinery.dm
2015-03-21 19:23:37 -05:00
cdefe65ae2
Update Chemistry-Machinery.dm
2015-03-21 18:50:28 -05:00
568c088dd0
Update machine_designs.dm
...
Added Chem Master Board to circuit Imprinter
2015-03-21 18:23:36 -05:00
5873aff8de
Update Chemistry-Machinery.dm
...
Added a constructable Chem Master 2999. Unlike the 3000 it cannot be wrenched and drug around.
2015-03-21 17:47:37 -05:00
31c5e648f4
Secbots now require Sec helmets
...
Only Sec helmets with a camera and no flashlight can be used to create a
securitron assembly.
2015-03-21 17:10:55 -05:00
98f9916317
Yet more work on slime procs and life subprocs.
2015-03-21 20:44:32 +01:00
01c18eadca
Replaced prob(rand(A,B)) with prob((A+B)/2).
...
They are the same probability.
Rounded to integers where the values were literals.
2015-03-21 19:12:16 +01:00
7f6871c233
Fixes conflicts and commits
2015-03-21 12:47:25 -04:00
0173c7af6e
Adds everything and makes it all work perfectly. It's like I'm almost good at this or something. (Seriously, points of interest: Secbots react to being shot. Dart rigging. Donksoft guns.)
2015-03-21 16:18:32 +00:00
daa1bdf856
More work on slime procs.
2015-03-21 16:37:37 +01:00
e9f21c3b28
Merge pull request #8462 from xxalpha/cyberimplants
...
Cyber Implants Addendum
2015-03-21 13:38:27 +01:00
3888013a43
Changed flag list to flag var.
2015-03-21 12:24:27 +00:00
afa1b76cde
Merge pull request #8190 from xxalpha/cyberimplants
...
Cybernetic Implants
2015-03-21 13:19:26 +01:00
920f97608a
Fixed bugs.
2015-03-21 11:53:54 +00:00
4659724851
Mini-Fix for flashlighting invalid helmets
...
I am going to expand on it later.
2015-03-21 02:52:05 -05:00
283170316d
Fixes the zombie powder recipe
2015-03-21 00:09:06 -07:00
2271499db7
Merge pull request #8058 from Iamgoofball/explosive
...
GOONCHEM 5: Pyrotechnics are finished, Toxins mostly complete
2015-03-21 09:54:11 +03:00
829045231b
fixes shit
2015-03-20 23:41:55 -07:00
c4f7ee6196
Merge pull request #8233 from Iamgoofball/patch-44
...
Meth no longer breaks the space time continuum.
2015-03-21 17:23:55 +11:00
08b3f3b6d4
fixes descriptions
2015-03-20 22:26:05 -07:00
819422bc3e
Merge pull request #8410 from Miauw62/yesgunhogimrewritinggoofsay
...
MIAUW VON SAYCODE 3: RISE OF THE SPANS
2015-03-21 05:05:37 +00:00
a2cb917473
initro tweaks
2015-03-20 22:03:03 -07:00
65b0bf7a14
new colors for smoke, flash, and sonic powder
2015-03-20 21:12:20 -07:00
26c407ec91
removes outdated comments
2015-03-20 20:17:19 -07:00
88a38cf884
embedding for gar glasses
2015-03-20 22:31:20 -04:00
c474035261
*Retires Departmental Uprising to the land of admin only access like its brother fake explosion before it *Changes the mechanics of recasting summon events to only reduce the upper limit of the time between event casts (-1 minute each additional cast) as opposed to touching the lower limit as well, which led to events every 15/30 seconds which, while certainly a scene, I admit was a bit much. Casting summon events 5, 6, or 7 times will now at worst result in an event every minute.
...
*If a wizard round mulligans, summon events will turn off if it was used. Remember that in wizard mulligans any apprentices will need to be dead too.
2015-03-20 21:04:33 -04:00
902e50f6b2
Added inbuilt jetpack to syndicate hardsuit.
2015-03-21 00:46:39 +00:00
d9921411b8
Changed anti-drop implant emp_act(). Added designs to mech fabricator.
2015-03-21 00:17:27 +00:00
d3d491588e
Cleaned up the functionality and prepared things for PR.
2015-03-20 23:19:19 +00:00
57f544ffdf
Removed dangerous "hacked" foam darts, as they were a little more powerful than intended. Hopefully this is something I can fix at a later date. Fixed non-magazine ammo boxes not accepting their correct ammo type. Added a speed collection system to all ammo boxes. Finally balanced out the cargo ordering stuff.
2015-03-20 23:19:04 +00:00
a030c9889e
Glorious second commit, introducing (mildly) dangerous rounds and a new suicide check.
2015-03-20 23:03:06 +00:00
b758992e8c
First (of probably several) commits to add Foam Force toy guns. Adds the new guns and crossbow, removes the old crossbow, and makes these new guns available to cargo.
2015-03-20 23:02:53 +00:00
69d4536844
Code tweaks. Designs are now in 'Medical'.
2015-03-20 22:57:52 +00:00
92684d7717
Merge branch 'master' of https://github.com/tgstation/-tg-station into SlimeAnimal
2015-03-20 22:26:23 +01:00
48bbf303da
Fix conflict in xenobiology.dm
...
Simplify simple_animal/attackby()
more work on slimes.
2015-03-20 22:05:09 +01:00
41cb54b8f4
Remove xylophone skeleton ribcage playing
2015-03-20 12:10:52 -07:00
8bb7b3b50f
MINE IS THE DRILL THAT WILL PIERCE THE HEAVENS
...
added meson gar glasses to mining vendor
made gar glasses names consistent
2015-03-20 14:45:39 -04:00
0ad731d057
Merge pull request #8344 from MMMiracles/bearfood
...
Adds 3 new bear-related foods.
2015-03-20 19:45:00 +01:00
aecb365f84
Merge branch 'master' of https://github.com/tgstation/-tg-station into SlimeAnimal
...
Conflicts:
code/modules/mob/living/carbon/alien/life.dm
code/modules/mob/living/carbon/life.dm
code/modules/mob/living/carbon/slime/slime.dm
code/modules/mob/living/silicon/robot/life.dm
code/modules/mob/living/simple_animal/slime/life.dm
2015-03-20 19:32:16 +01:00
182a3da16a
More work on slimes. Moving xenobiology items to modules/research/xenobiology
2015-03-20 19:17:03 +01:00
c25576ad6a
Merge remote-tracking branch 'upstream/master' into catwalkmachines
...
Conflicts:
code/game/objects/structures/lattice.dm
2015-03-20 17:02:00 +00:00
9e25fe4019
Merge pull request #8431 from AnturK/lawsupdated
...
Adds total law changes counter
2015-03-20 17:46:44 +01:00
57aadcc7fb
Merge pull request #8424 from phil235/SiliconWeldProtFix
...
Fixes silicons being flashed when welding.
2015-03-20 17:46:16 +01:00
d95209a5df
Merge pull request #8391 from Incoming5643/Statue_of_limitations
...
Fixes invincible unstoppable death statues
2015-03-20 17:43:22 +01:00
517e1f9c83
Merge pull request #8418 from Incoming5643/Absolute_territory
...
Adds absolute territory
2015-03-20 17:10:41 +01:00
46ca095f2b
Tweaks and fixes
...
- You can now make Securitrons with Sec helmets.
- Helmet cameras now function as borg cameras do. They will update the
chunk on the next game tick, if the camera is moved.
- Helmet cameras are now vulnerable to EMP (camera alarm is not
triggered)
- Removed the extra canAttachCam lines.
- Paid my tithe to Lord of Changelogs.
2015-03-20 09:39:50 -05:00
29477dfccc
adds GAR glasses of various flavors
...
you're welcome
2015-03-20 01:29:54 -04:00
e1668e985f
Attachable Seclite & Camera to Helmet
...
Steals #8109
2015-03-19 23:40:37 -05:00
5b18ed7c2e
Merge pull request #8403 from MrPerson/no_bug_here
...
Fixes character appearances - no more bald albinos
2015-03-20 04:36:32 +00:00
Razharas
Pennwick
GunHog
phil235
Szunti
Xhuis
Fayrik
Swag McYolosteinen
xxalpha
Iamgoofball
Jordie
Remie Richards
dannno
Incoming
MrPerson