98c158f958
Merge pull request #9845 from AnturK/buttsender
...
Adds PDA-Message Photo Attachment
2015-06-17 20:36:52 +02:00
ee87a1dc23
Merge pull request #9974 from phil235/MirrorRaceChangeFix
...
Mirror race change fix
2015-06-17 12:54:19 -05:00
e52486cf8e
Merge pull request #9933 from xxalpha/rapiddeconstructiondevice
...
Fixes RCD wall deconstruction runtime.
2015-06-17 17:13:39 +02:00
63aa008077
Merge pull request #9401 from Firecage/ofgibtonite
...
Adds a check to prevent a future ranged Gibtonite message + fixed the message
2015-06-17 15:12:10 +02:00
c7029ff806
Merge pull request #9799 from kyrahabattoir/glassUtility
...
Mapping tool: adds a "structure" spawner that can be used to create "…
2015-06-16 13:25:00 -05:00
26d75cc5ba
Merge pull request #9863 from MrPerson/508_compilation
...
Makes the game compile in byond version 508
2015-06-16 19:38:11 +10:00
ae8c69f9a7
Merge pull request #9955 from kingofkosmos/spanspaceremoval
...
Unnecessary space removal from spans and messages
2015-06-15 18:20:04 +02:00
d275152a96
Fixes the wizard magic mirror race change.
...
Fixes the "race swap" wizard event.
2015-06-15 17:01:07 +02:00
8fc003029c
Merge branch 'master' of https://github.com/tgstation/-tg-station into ironicthatonehumanisasectorzerolaw
...
Conflicts:
code/modules/mob/living/silicon/robot/robot.dm
2015-06-15 16:34:56 +10:00
2e7ddc1f45
Merge pull request #9053 from MrPerson/screen_alert_2
...
More screen alerts
2015-06-15 01:00:20 +02:00
ec8cd61d4c
Merge pull request #9808 from Incoming5643/march_of_the_snowflakes
...
WJohn's Hyper Customizable Lizard Sprites
2015-06-14 17:40:20 -05:00
5e425cad89
Merge pull request #9945 from phil235/ExplosionThrowAnchorFix
...
Explosions no longer throw anchored items.
2015-06-14 17:26:10 -05:00
e9419764f7
Merge pull request #9929 from kingofkosmos/seclockerfix
...
Locker unlocks if you attack it with an empty hand
2015-06-14 17:12:44 -05:00
565e4dda5a
Merge pull request #9931 from Jordie0608/tfwyougetsocarriedawayyoudontevenachievewhatyousetoutforandhavetomakeasecondprforit
...
Overlays for computers
2015-06-14 10:25:27 -05:00
c8d79e7034
Removed unnecessary spaces in these situations:
...
"span class = '" changed to "span class='"
"'> " changed to "'>"
2015-06-14 12:13:19 +03:00
7adeaf0beb
Explosions no longer throw anchored items.
2015-06-14 00:46:54 +02:00
e90b472800
Fixed RCD wall deconstruction runtime.
2015-06-13 13:17:02 +01:00
752f5e883d
eol conversion
2015-06-13 20:15:49 +10:00
5ef93b2225
overlays for computers
2015-06-13 20:07:48 +10:00
899f2f5119
Security locker unlocks if you attack it with an empty hand.
2015-06-13 11:20:33 +03:00
29730ce479
Merge pull request #9412 from RemieRichards/ReactionaryExplosions
...
Ports VG's DeityLink's new explosion method
2015-06-13 04:45:23 +03:00
b7150068cc
Merge pull request #9783 from nukeop/master
...
Adds a chemistry bag for moving large amounts of patches/pills/bottles at once
2015-06-13 04:42:16 +03:00
7dbd3b13da
Merge pull request #9872 from xxalpha/itsalwaystrue
...
Fixes infinite cyborg stack usage on a couple of things.
2015-06-13 04:34:05 +03:00
4373f6eece
Merge pull request #9904 from xxalpha/runtimesrun
...
Fixes three runtimes.
2015-06-13 04:29:20 +03:00
ec6c0465b5
Merge pull request #9879 from Incoming5643/skeleton_man
...
Magic Mania 1.91: Life's a lich and then you rework the mechanic to be less terrible
2015-06-13 04:24:38 +03:00
78ec879f27
- Ghosts can hear gang messages
...
- Gang spraycans no longer have a unique name for more stealth
2015-06-12 08:22:42 -06:00
d2ef043690
Resolved Conflicts:
...
code/modules/mob/living/living.dm
2015-06-11 23:46:59 -06:00
595bb0c8e4
Generalizes lizard parts to "features" for future non-lizard fields, at the same time merging mutant color into this list
...
Random lizard bodies will finally have color!
Pushes features almost all the way to the DNA side of thing, the mob side is only needed during character creation.
Note that changes to the save file will invoke a one time per character runtime for legacy characters as the save file purges mutant_color, this is as far as I can tell harmless, has no effect on the player, and is self correcting.
2015-06-12 00:43:35 -04:00
9ba7e6aaf4
Fixes three runtimes.
...
Better fix. src. purge
2015-06-11 21:30:13 +01:00
7363088cbc
Merge pull request #9802 from Miauw62/AyeEye
...
Nerfs the AI in several minor ways.
2015-06-11 14:13:52 -05:00
808ffb4160
Merge pull request #9902 from Miauw62/inexperience
...
Removes strip_html_properly(), replaces it with html_encode().
2015-06-11 10:31:53 -05:00
d72cb4bdf1
Merge branch 'master' of https://github.com/tgstation/-tg-station into ReactionaryExplosions
...
Conflicts:
code/game/machinery/doors/poddoor.dm
code/game/turfs/simulated/floor/plating.dm
code/game/turfs/unsimulated/walls.dm
code/modules/admin/admin_verbs.dm
2015-06-11 16:23:45 +01:00
1800c56456
Merge pull request #9769 from Cheridan/ACTUAL_FUN_REMOVAL
...
Adjusts Chaplain Special Bible Equipment
2015-06-11 16:15:41 +01:00
a881478743
Removes strip_html_properly(), replaces it with html_encode().
...
It was not as proper as the name would imply, and experience and amused redditors have taught me that writing a proper HTML-scrubbing function is a very hard task indeed.
2015-06-11 15:37:41 +02:00
59d9098d26
Gang Update
2015-06-10 23:05:58 -06:00
1f0097a74a
Adds the bind soul spell for wizards. It turns them into a lich (skeleton) and gives them access to a long cooldown ressurection spell (starts at 3 minutes).
...
The ressurection spell can only be used while dead/dying and charges at all times. When used the lich gains a new body at the site of their phylactery and is stunned for a short while. Meanwhile the old wizard body crumbles to dust leaving all the wizards worldly possessions on the ground. Anyone who sees the corpse crumble will also get a cardinal direction pointing towards the wizard.
Every time the wizard dies this way, the time between ressurections is increased by a minute. To take a lich out of the game for good, either destroy the body before the lich can cast the spell again, or destory the phylactery and kill the wizard one last time.
Liches spawn with robes and spells intact, but nothing else, everything collected on their original body stays there.
As a balance issue, this spell can't be used in the den, the item must be bound after arriving at the station.
Adds a nice black wizard robe ensemble for liches.
Magic mirrors (save for a special badmin only one) can no longer skeletonize people.
Adds a hopeful mulligan fix to wizard rounds problems. Also corrects an adminlog message.
2015-06-10 03:40:14 -04:00
ed6b1d137c
Fixes infinite cyborg stack usage on a couple of things.
...
Kill debug msg
Better fix.
Finished better fix.
NOW FINISHED
2015-06-10 03:27:04 +01:00
b873176a77
Merge pull request #9821 from Cheridan/just_cuff_my_shit_up
...
REMOVES CABLE CUFFS...
2015-06-10 01:17:35 +03:00
7c3cb399d0
Makes the game compile in byond version 508
...
throw is a reserved keyword so all throw() and var/throw had to be renamed.
Only compile tested because I'm fucking lazy.
2015-06-09 04:14:12 -07:00
9dc713ba9c
Merge branch 'master' of https://github.com/tgstation/-tg-station into screen_alert_2
...
Conflicts:
code/_onclick/hud/alert.dm
code/game/objects/items.dm
code/modules/mob/living/carbon/human/human.dm
icons/mob/screen_alert.dmi
2015-06-09 03:23:18 -07:00
d7e3363129
Merge pull request #9817 from xxalpha/dropfixes
...
Fixed hacking from inside machines.
2015-06-08 21:27:32 -05:00
b572db24c5
Adds AI functionality
2015-06-08 18:26:41 +02:00
46a4d6fe8f
Adds PDA-Message Photo Attachment
2015-06-08 17:40:24 +02:00
29c2bb474d
Merge pull request #9804 from Firecage/Exwelder
...
Adds the experimental welder to R&D + adds some descriptions.
2015-06-07 21:23:45 -05:00
f81da3f13d
Merge pull request #9818 from phil235/TypoJanicartFix
...
Fixes typo in janitorial cart message.
2015-06-07 16:50:56 -05:00
0e28326097
Merge pull request #9779 from Cheridan/touching_linda
...
Pressure_resistance Tweaks
2015-06-07 04:57:52 +03:00
46acc2a55d
REMOVES CABLE CUFF
2015-06-06 16:21:41 -05:00
3c59772025
Polishes the AI nerfs a bit:
...
* Removed camera wires.
* Tracking time is now dependant on distance to eye instead of core.
* AI detectors will light up when the AI tracks you.
Also added a changelog.
2015-06-06 16:51:09 +02:00
24463314f9
Fixes typo in janitorial cart message.
2015-06-06 13:30:20 +02:00
ccd4137a9d
Merge pull request #8974 from kingofkosmos/mopbucket
...
Mopping with just a bucket
2015-06-06 13:18:07 +02:00
phil235
Cheridan
Jordie
phil235
kingofkosmos
xxalpha
Razharas
Ikarrus
Incoming
Remie Richards
Miauw
MrPerson
AnturK
Cheridan