bb28a8ce14
Merge pull request #11985 from KorPhaeron/guardianfix
...
Small Guardian Fixes
2015-09-29 23:14:50 +10:00
227f649119
Merge pull request #12017 from KorPhaeron/logging
...
Logging for communication powers/verbs
2015-09-29 01:45:39 +03:00
1b59be64ff
More fixes, adds self to admins.txt
2015-09-28 17:52:33 -04:00
7a8c52b84f
Merge remote-tracking branch 'remotes/upstream/master' into syndiborg_fix
2015-09-28 07:15:49 -04:00
fea580a30e
Conflicts 1/3
2015-09-28 07:15:41 -04:00
ba07442a69
Merge pull request #12028 from phil235/AddbloodRuntimeFix
...
Fixes some runtimes, syndiborg module and grenade launcher
2015-09-28 06:36:54 -03:00
129b7b9b2f
Fixes & tweaks
2015-09-27 23:27:18 -04:00
50dd1f6b67
Merge pull request #12031 from Xhuis/a_pretty_rad_pr
...
Radiation changes
2015-09-28 03:24:43 +03:00
93251b9870
fuck? FUCK!
2015-09-28 02:34:26 +03:00
131b69474e
Merge branch 'master' of https://github.com/tgstation/-tg-station into HandOfGod-Resurgence
...
Conflicts:
code/__HELPERS/unsorted.dm
code/game/objects/items/stacks/sheets/sheet_types.dm
code/modules/client/preferences.dm
icons/mob/feet.dmi
icons/mob/head.dmi
icons/mob/inhands/items_lefthand.dmi
icons/mob/inhands/items_righthand.dmi
icons/mob/mob.dmi
icons/obj/clothing/hats.dmi
icons/obj/clothing/shoes.dmi
icons/obj/clothing/suits.dmi
icons/obj/items.dmi
icons/obj/projectiles.dmi
2015-09-27 17:15:01 +01:00
58483beb50
Hand of god gamemode!
...
be_special and antag defines are no longer limited to 16 values (1 - 32768) by being changed from a bitfield to a list, an appropriate block of code exists to automatically update bitfield versions to the new list format. the list format allows us to have (functionally) infinite antag types.
2015-09-27 16:49:56 +01:00
a3b7625c96
Adds "On Fire" screen alert. Resists when you click it.
...
Adds a warning-message when you try to help-intent someone who's on fire.
Makes fire spread from burning people who are lying down take 2 seconds if you stand on top of them. Spreading is immediate if you're covered in flammable stuff.
2015-09-27 12:33:26 +03:00
ef2ef726ce
Fixes Larva/Silicon resizing
2015-09-26 21:01:08 +02:00
5f99b313cc
Radiation changes
2015-09-26 13:33:27 -04:00
4fafc3e542
Fixes rudimentary transformation not using the client's preferences for human bodies.
2015-09-26 18:49:54 +02:00
1d56ff80dc
Fixes runtimes with add_blood() and add_blood_list()
...
Fixes formatting in the mech control console window.
Fixes runtimes when building an AI (mind transfer from mmi to ai was called before the AI's hud_list was set)
Fixes syndicate cyborg not starting with the correct module.
Fixes syndiborg not being able to use their grenade launcher
Fixes runtime with gun process_fire() (some code was reverted by accident)
Fixes a runtime with hostile simple animal's PickTarget().
2015-09-26 13:21:20 +02:00
03e1bcfd2b
Inert hivelord core is still useful for surgery
2015-09-25 22:37:42 +03:00
feeb9ff7d2
Organs update 3
2015-09-25 22:26:15 +03:00
2b5d756a78
Oops
2015-09-25 14:07:39 -05:00
bfa7119bef
Online editor, lets see if it compiles
2015-09-25 14:06:40 -05:00
b44bad10f6
Logging
2015-09-25 13:04:57 -05:00
3011efb59e
Additional Logging
2015-09-25 13:00:22 -05:00
a687b07eac
f u c k c o n f l i c t s
2015-09-25 14:35:44 +03:00
e4a2745723
Merge pull request #11975 from Iamgoofball/patch-123
...
Removes very dumb song references from the fox descriptions
2015-09-25 06:03:11 -03:00
bbd2b1883c
Tail sweep
2015-09-24 23:49:47 -05:00
0f5917b42d
Merge pull request #11889 from Xhuis/fuck_you_thomas_laser
...
New changeling power; tweaks to fleshmend/last resort
2015-09-25 04:24:38 +03:00
4e644df7cc
Runtime fix
2015-09-24 16:17:37 -05:00
b1185747bb
Fixes
2015-09-24 12:55:54 -05:00
83354fa364
Fixes
2015-09-24 18:26:12 +02:00
a99ed56f27
Atom Buckling - Squashed
2015-09-24 16:21:05 +02:00
94b465399a
Merge pull request #11928 from Lijah99/ShadeAttackFix
...
Fixes shade attack text to be applicable to everything
2015-09-24 14:13:47 +02:00
f6508e03a1
Merge pull request #11605 from kingofkosmos/aisparksanddeademote
...
AI damage and dying indicators
2015-09-24 14:11:04 +02:00
6a56d2a1ae
Removes very dumb song references from the fox descriptions
...
how did this make it past the great firewall of meme removal
2015-09-23 20:18:27 -07:00
d3aa84e978
Merge pull request #11937 from KorPhaeron/profligateslikeyoubelongonthecross
...
Hanging any mob from the kitchen spike
2015-09-24 02:14:06 +03:00
4a99082cf6
Merge pull request #11888 from KorPhaeron/toolboxcrusaders
...
Guardian Changes
2015-09-24 01:46:59 +03:00
d6779855c1
Merge pull request #11946 from Lijah99/ACTUALLYFixesVehicleFootprints
...
ACTUALLY fixes footprints while in a vehicle/buckled
2015-09-24 01:22:49 +03:00
c410d1680d
Fixes brains sharing their dna with another carbon, which causes runtimes when the carbon and its dna is deleted.
2015-09-23 23:05:26 +02:00
c11edd8418
Butcher update
2015-09-23 12:30:56 -05:00
b0a89af2c6
Left a line in the wrong place
2015-09-23 01:16:30 -05:00
29e1858fcf
New sprites
2015-09-22 23:53:26 -05:00
f16b4e1903
Merge remote-tracking branch 'tgstation/master' into toolboxcrusaders
2015-09-22 23:41:02 -05:00
8a71d3e875
Merge pull request #11809 from Xhuis/even_better_than_a_mass_emagger
...
Uplink rebalance
2015-09-22 23:40:18 -05:00
a5d7ae8d92
Merge branch 'master' of https://github.com/tgstation/-tg-station
2015-09-23 03:24:17 +03:00
e5296ffa7d
AnturKs fixes without mutation fix
...
AnturKs fixes without mutation fix
2015-09-23 03:21:00 +03:00
d515d55558
ACTUALLY fixes footprints while in a vehicle/buckled
2015-09-22 15:17:04 -06:00
5fe0762beb
Conflicts 2/3
2015-09-22 16:42:34 -04:00
6711406d6a
Conflicts 2/3
2015-09-22 16:37:00 -04:00
835da91620
Merge pull request #11883 from phil235/DnaMonkeyStuff
...
DNA rework
2015-09-22 18:43:27 +03:00
42352e915b
Buckling fixes
2015-09-21 23:13:02 -05:00
01c362f069
Merge pull request #11757 from Xhuis/side_antagonist_tweaks
...
Side Antagonist Tweaks
2015-09-22 12:26:00 +10:00
Jordie
Razharas
Xhuis
Aranclanos
c0
Remie Richards
kingofkosmos
AnturK
phil235
KorPhaeron
KorPhaeron
phil235
Iamgoofball
Cheridan
Razharas
Lijah99