e9f21c3b28
Merge pull request #8462 from xxalpha/cyberimplants
...
Cyber Implants Addendum
2015-03-21 13:38:27 +01:00
29e441f3ad
Finished changing permanent_sight_flags.
2015-03-21 12:28:25 +00:00
afa1b76cde
Merge pull request #8190 from xxalpha/cyberimplants
...
Cybernetic Implants
2015-03-21 13:19:26 +01: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
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
31de411a11
Merge remote-tracking branch 'upstream/master' into cyberimplants
...
Conflicts:
code/modules/mob/living/carbon/carbon.dm
code/modules/mob/mob_defines.dm
2015-03-18 20:11:51 +00:00
1b753dd1c5
Adds the comic sans span to the new system.
2015-03-18 21:09:36 +01:00
a9ed716853
Fix nuke-op shuttle gets infinitely hot issue
...
Cause was faulty logic in datum/gas_mixture/mimic() that was leaking a null value into some multiplication math. It's still wrong, but at least it keeps the air too cold instead of making it literally infinitely hot.
Fixes #7691
Fixes #4740
Fixes #8166
2015-03-17 14:53:12 -07:00
f0731d01e2
changelog compiled
2015-03-17 20:03:31 +11:00
78d28a6d64
Merge branch 'master' of https://github.com/tgstation/-tg-station into BigUserdanger
...
Conflicts:
code/modules/events/ninja.dm
2015-03-15 12:30:27 +01:00
da1e6f57f0
Merge pull request #8334 from MrPerson/cleanup_crew_comin_through
...
Code cleanup
2015-03-15 01:55:39 -05:00
e5428c1519
Merge pull request #8256 from phil235/StrangenessTextFix
...
Strangeness text, janicart, alien nest, weak golem fixes
2015-03-13 15:23:30 -05:00
9038fb15af
Code cleanup
...
Removed a bunch of unused or hardly used vars on /mob and /atom/movable.
Added defines for mob/living/var/mob_size so it's not using magic numbers.
2015-03-13 10:41:00 -07:00
29609457f5
Makes the message when you're attacked slightly bigger for better visibility."
...
Changes two "for... show_message()" into "visible_message()".
2015-03-12 23:15:54 +01:00
51e3bef054
Merge pull request #8294 from norill/mutfix
...
acquiring negative mutations shows in red in chat
2015-03-12 20:11:28 +01:00
5ef5c5444d
acquiring negative mutations shows in red in chat
2015-03-11 17:11:35 +01:00
0f01378e7a
Reworked suggested code, added brain implants, misc additions.
...
Fix missing ')'.
DELETE THIS
2015-03-09 20:39:09 +00:00
8a1a5ff832
Fixes Strangeness mutation gain text not appearing.
2015-03-09 16:49:31 +01:00
e846a6eeb4
Merge branch 'TheAnimalsTheyAttack!' of git://github.com/Sometinyprick/-tg-station into Sometinyprick-TheAnimalsTheyAttack!
...
Conflicts:
code/game/gamemodes/wizard/spellbook.dm
icons/mob/mask.dmi
2015-03-09 01:47:40 -05:00
fc81daee07
Added Thermals and emp_act(). Tweaked some related code.
2015-03-08 20:19:02 +00:00
b1e340b19b
Added X-ray implant, implant icon, touched up surgery.
2015-03-08 17:25:05 +00:00
d61cf2b022
Merge pull request #8107 from Cheridan/loot_ops
...
Nuke Op Loot Pinata Tweaks
2015-03-06 11:48:07 -08:00
f0c3c9af07
Merge remote-tracking branch 'upstream/master' into cyberimplants
2015-03-06 18:52:25 +00:00
38bae63251
Added cybernetic implants and surgery.
2015-03-06 18:52:04 +00:00
07676b352d
Merge pull request #8128 from Ikarrus/gangfixup
...
Makes Gang mode functional again
2015-03-05 21:11:59 -06:00
9b28452bfe
Makes Gang mode functional again
...
I'm going on vacation soon so I thought I might as well bring this game mode back up to at least a minimally functional state before I go.
A lot of features (Gang membership visibility, conversion pens, weapons, deconversion methods) have been stripped out for now. I gave gang bosses uplinks in the meantime.
It's basically rev vs rev right now, but the victory conditions with the recallers are still there. I'll work on adding more stuff after I return from my vacation.
2015-03-02 23:46:46 -07:00
73658a8c0b
Updates SSU, Reprices Explosive Implants
2015-03-02 00:09:37 -06:00
15c10dd427
Preserve Objectives when admin-removing antag status
...
Sometimes admins want to change someone's antag type or simply refresh their antag status to fix bugs, while still preserving their objectives. Being forced to lose them makes these really frustrating to do!
Admins can still manually remove their objectives from the same window (Mind Window/Traitor Panel).
2015-03-01 21:08:14 -07:00
f64fb21f47
Merge pull request #7955 from Jordie0608/greytiderahelps!admintakes10braindamage!
...
Fixes #7288 VV, moreinfo stamina display and replaces CA with TP
2015-02-25 19:53:41 -08:00
6b815c7801
Stamina on adminmoreinfo and vv; ahelp and pray CA replaced by TP
2015-02-24 20:02:43 +11:00
4735e1c02a
Merge branch 'master' of https://github.com/tgstation/-tg-station into drugs
2015-02-23 18:47:21 -08:00
e889ee7a42
Merge pull request #7700 from RemieRichards/ExplosionsAndEmbedding
...
Items Embedding in Limbs
2015-02-24 01:22:01 +03:00
a5a7b590d3
Merge pull request #7866 from phil235/PullBuckleFix
...
Fixes being able to break free from a pull while handcuffed if the puller is buckled.
2015-02-22 20:18:54 -08:00
7b8a8a3308
Merge pull request #7870 from phil235/WindowFormattingFix
...
Two window fixes
2015-02-22 20:18:21 -08:00
c0c8a739e2
Merge pull request #7721 from paprka/miening
...
Mining & mine-related chem changes
2015-02-22 20:17:24 -08:00
8e4982276a
Merge pull request #7825 from RandomMarine/cargokits
...
Adds brute first aid kits to cargo.
2015-02-22 12:06:22 +01:00
19e3cd5d1e
Fixes a window's size and a colored text in another one.
2015-02-21 16:24:13 +01:00
e9a943218c
Fixes being able to break free from a pull while handcuffed if the puller is buckled.
...
Add the incapacitated proc to mobs to check for stat, stun, weakened, paralysis, restrained. And replacing those checks by that new proc in some places.
2015-02-21 14:49:47 +01:00
e24e94544e
Merge branch 'master' of https://github.com/tgstation/-tg-station into drugs
...
Conflicts:
code/modules/food&drinks/food/snacks_meat.dm
code/modules/reagents/Chemistry-Reagents/Consumable-Reagents/Food-Reagents.dm
icons/obj/drinks.dmi
icons/obj/food.dmi
2015-02-20 22:00:53 -08:00
e5b53f2e3c
Finishing up
2015-02-21 01:26:58 +00:00
ea12d68e60
Merge pull request #7817 from paprka/whatthefucktg
...
Syndicate shotguns spawn with buckshot by default
2015-02-19 13:07:08 -08:00
42fe551665
Merge branch 'master' of https://github.com/tgstation/-tg-station into ExplosionsAndEmbedding
...
Conflicts:
code/modules/mob/living/carbon/human/life.dm
2015-02-19 18:16:33 +00:00
0d0ef9e02a
Deactivates the Hidden Syndicate Teleportation Device
2015-02-19 16:34:49 +01:00
b0d591f110
Adds brute kits to cargo
2015-02-18 20:41:47 -08:00
efbb4f5116
makes syndicate shotguns spawn with buckshot by default
2015-02-18 14:10:46 -08:00
52477eb16e
Adds a new spell. The Barnyard curse
...
Created a new file because I didn't want to get rid of the horseman
curse. Essentially the same as the horseman curse but you can also be a
pig and a cow.
2015-02-17 00:44:45 +00:00
c9f9d30227
Air Alarm Deconstruction fix: you no longer need to cut the syphon wire to deconstruct the air alarm.
...
You can no longer open or interact with the wire window after the wires are removed.
You can no longer cut the final wire while the panel is closed.
Adding wires to the air alarm now properly reset the variables that the wires change upon cutting/pulsing.
2015-02-14 17:53:22 +01:00
88760896ad
initial commit
2015-02-13 20:59:39 -08:00
34ced43f45
Explosions throw items, items can embed in limbs, embedded items cause damage, embedded items can fall out, surgery for embedded item removal, ninja throwing stars!
2015-02-13 12:59:02 +00:00
216630f1db
Merge pull request #7572 from phil235/CookingOverhaul
...
Cooking overhaul
2015-02-12 08:01:17 -06:00
Swag McYolosteinen