Jordie
59af7cfd42
Merge pull request #8323 from Mandurrrh/miningborgupgrade
...
Adds a cyborg upgrade module for the satchel of holding.
2015-03-24 16:40:52 +11:00
hornygranny
979d308f49
Merge pull request #8497 from Iamgoofball/patch-46
...
fixes sodium thiopental bottle
2015-03-23 16:34:01 -07:00
hornygranny
1b16960f31
Merge pull request #8481 from Miauw62/agqgdoqio
...
Re-adds forcesay
2015-03-23 16:32:37 -07:00
hornygranny
2e04be734f
Merge pull request #8449 from MrPerson/feature_removal_5
...
Remove xylophone skeleton ribcage playing
2015-03-23 15:10:11 -07:00
Cheridan
beacf0cf4a
Merge pull request #8349 from MrPerson/qdel_reagents_hopefully
...
Fix reagent garbage collection hopefully
2015-03-23 08:55:11 -05:00
Cheridan
6543b5c1e9
Merge pull request #8461 from Iamgoofball/patch-45
...
Fixes the zombie powder recipe
2015-03-23 08:39:16 -05:00
Cheridan
773dd84211
Merge pull request #8452 from Incoming5643/when_shit_gets_too_popular_death_must_follow
...
Magic Mania 1.87: Summon Events Settles Down And Starts A Family
2015-03-23 08:36:04 -05:00
Iamgoofball
f1b40bf6ae
fixes sodium thiopental bottle
2015-03-22 20:19:21 -07:00
Razharas
6baed3a0e5
Merge pull request #8464 from Szunti/patch-1
...
prob() with rand() is the same as a plain prob()
2015-03-23 00:27:47 +03:00
Swag McYolosteinen
53e40ec315
Merge pull request #8427 from Cheridan/day3_collars
...
Event Day 3 - Pet Collars!
2015-03-22 19:37:12 +01:00
Cheridan
e5c3d421db
Adds renaming, Adds collars to pet crates
2015-03-22 13:16:30 -05:00
Miauw
521820f289
Makes the white dress a suit.
2015-03-22 19:13:15 +01:00
Miauw
e5637301ba
Adds a jester suit and a white dress, both by Nienhaus.
2015-03-22 19:12:25 +01:00
Nienhaus
9486248553
Merge pull request #8440 from dannno/coperite
...
GAR GLASSES
2015-03-22 12:05:21 -05:00
Swag McYolosteinen
5bf9366bab
Removes spaces causing inconsistent indentation error
2015-03-22 13:01:08 +01:00
Swag McYolosteinen
ef156368ca
Re-adds forcesay
2015-03-22 12:34:55 +01:00
MrPerson
9229f72573
Fix up certain chemicals to not overwrite Del(). Meh.
...
Merge branch 'master' of https://github.com/tgstation/-tg-station into qdel_reagents_hopefully
Conflicts:
code/modules/reagents/Chemistry-Reagents/Chemistry-Reagents.dm
2015-03-21 23:04:53 -07:00
Jordie
94de5c997e
Merge pull request #8439 from GunHog/SteelpointsSecCamsAndLights
...
Attachable Seclite & Camera to Helmet
2015-03-22 16:56:11 +11:00
Razharas
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
GunHog
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
Szunti
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
Swag McYolosteinen
e9f21c3b28
Merge pull request #8462 from xxalpha/cyberimplants
...
Cyber Implants Addendum
2015-03-21 13:38:27 +01:00
xxalpha
3888013a43
Changed flag list to flag var.
2015-03-21 12:24:27 +00:00
Swag McYolosteinen
afa1b76cde
Merge pull request #8190 from xxalpha/cyberimplants
...
Cybernetic Implants
2015-03-21 13:19:26 +01:00
xxalpha
920f97608a
Fixed bugs.
2015-03-21 11:53:54 +00:00
GunHog
4659724851
Mini-Fix for flashlighting invalid helmets
...
I am going to expand on it later.
2015-03-21 02:52:05 -05:00
Iamgoofball
283170316d
Fixes the zombie powder recipe
2015-03-21 00:09:06 -07:00
Razharas
2271499db7
Merge pull request #8058 from Iamgoofball/explosive
...
GOONCHEM 5: Pyrotechnics are finished, Toxins mostly complete
2015-03-21 09:54:11 +03:00
Iamgoofball
829045231b
fixes shit
2015-03-20 23:41:55 -07:00
Jordie
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
Iamgoofball
08b3f3b6d4
fixes descriptions
2015-03-20 22:26:05 -07:00
Remie Richards
819422bc3e
Merge pull request #8410 from Miauw62/yesgunhogimrewritinggoofsay
...
MIAUW VON SAYCODE 3: RISE OF THE SPANS
2015-03-21 05:05:37 +00:00
Iamgoofball
a2cb917473
initro tweaks
2015-03-20 22:03:03 -07:00
Iamgoofball
65b0bf7a14
new colors for smoke, flash, and sonic powder
2015-03-20 21:12:20 -07:00
Iamgoofball
26c407ec91
removes outdated comments
2015-03-20 20:17:19 -07:00
dannno
88a38cf884
embedding for gar glasses
2015-03-20 22:31:20 -04:00
Incoming
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
xxalpha
d9921411b8
Changed anti-drop implant emp_act(). Added designs to mech fabricator.
2015-03-21 00:17:27 +00:00
xxalpha
69d4536844
Code tweaks. Designs are now in 'Medical'.
2015-03-20 22:57:52 +00:00
MrPerson
41cb54b8f4
Remove xylophone skeleton ribcage playing
2015-03-20 12:10:52 -07:00
dannno
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
Swag McYolosteinen
0ad731d057
Merge pull request #8344 from MMMiracles/bearfood
...
Adds 3 new bear-related foods.
2015-03-20 19:45:00 +01:00
xxalpha
c25576ad6a
Merge remote-tracking branch 'upstream/master' into catwalkmachines
...
Conflicts:
code/game/objects/structures/lattice.dm
2015-03-20 17:02:00 +00:00
Swag McYolosteinen
9e25fe4019
Merge pull request #8431 from AnturK/lawsupdated
...
Adds total law changes counter
2015-03-20 17:46:44 +01:00
Swag McYolosteinen
57aadcc7fb
Merge pull request #8424 from phil235/SiliconWeldProtFix
...
Fixes silicons being flashed when welding.
2015-03-20 17:46:16 +01:00
Swag McYolosteinen
d95209a5df
Merge pull request #8391 from Incoming5643/Statue_of_limitations
...
Fixes invincible unstoppable death statues
2015-03-20 17:43:22 +01:00
Swag McYolosteinen
517e1f9c83
Merge pull request #8418 from Incoming5643/Absolute_territory
...
Adds absolute territory
2015-03-20 17:10:41 +01:00
GunHog
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
dannno
29477dfccc
adds GAR glasses of various flavors
...
you're welcome
2015-03-20 01:29:54 -04:00
GunHog
e1668e985f
Attachable Seclite & Camera to Helmet
...
Steals #8109
2015-03-19 23:40:37 -05:00
