Commit Graph

15425 Commits

Author SHA1 Message Date
Iamgoofball
dc2bf262e6 Adds object spinning when thrown and *flip 2015-03-23 13:46:23 -07: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
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
Swag McYolosteinen
e9f21c3b28 Merge pull request #8462 from xxalpha/cyberimplants
Cyber Implants Addendum
2015-03-21 13:38:27 +01:00
xxalpha
29e441f3ad Finished changing permanent_sight_flags. 2015-03-21 12:28:25 +00: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
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
5d1155e09e Merge pull request #8435 from Zelacks/ChemImplantGuiFix
Chemical implant action button fix
2015-03-21 17:25:08 +11:00
Jordie
d622ea496c Merge pull request #8437 from Razharas/TurfFire
Fixes fires in the walls
2015-03-21 17:24:53 +11:00
Jordie
13fdc0e0cb Merge pull request #8299 from tgstation/RemieRichards-poolingUpdate
Makes PlaceInPool() call Destroy() on the atom
2015-03-21 17:24:17 +11: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
Jordie
d496fe241f Merge pull request #8228 from Xhuis/orion_trail_emag
Adds an emag mode to the Orion Trail game
2015-03-21 17:23:44 +11:00
Jordie
d361649df5 Merge pull request #8369 from pudl/retardfix
normal sec headset
2015-03-21 17:23:18 +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
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
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
7d17c54555 Merge pull request #8411 from xxalpha/cablefix
Fixes cables being destroyed when creating plating out of catwalk space.
2015-03-20 17:45:36 +01:00
Swag McYolosteinen
971c88b399 Merge pull request #8405 from Jordie0608/everythingisslowerinanemergencyapparently
Fixes #8393, backup shuttle coming when already called
2015-03-20 17:44:52 +01:00
Swag McYolosteinen
fd1b1f95b0 Merge pull request #8398 from MrPerson/red_herring_telecomms_equipment
Fix nuke-op shuttle gets infinitely hot issue
2015-03-20 17:44:30 +01:00
Swag McYolosteinen
28a9ff21d7 Merge pull request #8396 from Incoming5643/Zob_blombies
Blob zombie runtime fix + a tweak
2015-03-20 17:43:46 +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
Xhuis
03fcb9e139 Makes the machine less deadly to non-users 2015-03-20 07:23:59 -04: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
Remie Richards
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
MrPerson
721b81373a Removed commented out regenerate_icons() 2015-03-19 21:35:24 -07:00
Iamgoofball
f0f5eb7543 Reverts the turf checks on clf3 due to #8437 fixing the underlying issue 2015-03-19 20:09:04 -07:00
Razharas
6346e82f7d Fixes fires in the walls
Fixes fires in the walls
2015-03-20 05:50:06 +03:00