Razharas
8fa07d303c
Merge pull request #9820 from Cheridan/arbitrary_powerdrain
...
Removes Cyborg Per-Active Module Powerdrain
2015-06-10 00:21:50 +03:00
Xhuis
e206641698
More work
2015-06-09 16:37:35 -04:00
Cheridan
d14fec2f4f
Merge pull request #9827 from BananaCreamPie/spooctacular
...
Adds several sprites for ghostform
2015-06-09 15:17:17 -05:00
GunHog
7ddcbb1967
Tweak and fixes
...
- Made the interactions into defines.
- Fixed a runtime for when an AI tries to set a DNA lock.
2015-06-09 14:45:38 -05:00
NullQuery
c0bdf7d0f7
Compatibility with 508.
2015-06-09 19:45:13 +02:00
Xhuis
3f8faa6d7b
Revenant rework pt1
2015-06-09 13:36:48 -04:00
spasticVerbalizer
ab1252cc4a
remove duplicate empty message checks and replace with !message
2015-06-09 19:29:37 +02:00
nullquery
3f94a5271c
Merge pull request #1 from tgstation/master
...
Merge with upstream
2015-06-09 19:18:40 +02:00
MrPerson
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
MrPerson
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
MrStonedOne
ff5c9d3f5b
fixes readmin when username had upper case letters
...
fixes #9775
2015-06-09 01:18:22 -07:00
Razharas
937519ffde
Merge pull request #9843 from Aranclanos/Babyrage
...
Shuttle fix
2015-06-09 08:49:29 +03:00
Razharas
47a02231f1
Merge pull request #9813 from Iamgoofball/constructionjunctionwhatsyourfunction
...
Upgrade Update: Bluespace Boogaloo
2015-06-09 08:48:51 +03:00
Iamgoofball
81fcaa9344
PSHOOM
2015-06-08 20:38:50 -07:00
Iamgoofball
10c60a59b1
adds beam sprites @cheridan merge when???
2015-06-08 19:56:06 -07:00
Cheridan
d7e3363129
Merge pull request #9817 from xxalpha/dropfixes
...
Fixed hacking from inside machines.
2015-06-08 21:27:32 -05:00
Iamgoofball
b5fc2ca46b
committed balance ideas and NEW SPRITE FROM WJ
2015-06-08 19:01:43 -07:00
GunHog
d3fbacc224
Tweaks
...
- Sorts out the transfer_ai() proc, it can now be added to practically
anything you wanted to give to an AI.
- Moved mech functions to the unused middle click.
2015-06-08 20:46:01 -05:00
Iamgoofball
9919e6a0cf
INTRODUCING THE BLUESPACE RPED
2015-06-08 17:07:19 -07:00
NullQuery
43a12f93c1
Reduce lorem ipsum in the example code.
2015-06-08 22:23:55 +02:00
NullQuery
1b364c0e82
HTML interface module + playing cards (ported from Baystation12 with modifications) using the new module
2015-06-08 22:13:25 +02:00
spasticVerbalizer
7c1498dd6c
Removed empty message check from can_speak
2015-06-08 20:43:56 +02:00
Xhuis
a9c5a1d9ea
Adds a stage six singularity.
2015-06-08 14:36:50 -04:00
AnturK
46a4d6fe8f
Adds PDA-Message Photo Attachment
2015-06-08 17:40:24 +02:00
Aranclanos
f34b45b7b8
Fixes shuttles taking turfs that aren't part of the shuttle itself.
...
Fixes shuttles breaking apart if the turfs aren't strictly shuttle turfs (who are also gone in a previous commit, now under wall and floors paths)
Fixes #9722
Fixes #6856
Fixes #9788
2015-06-08 05:07:02 -03:00
Cheridan
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
Cheridan
e55c94c757
Merge pull request #9814 from Incoming5643/nothing_from_nothing_leaves_something
...
Fixes a runtime with dangerous_existence
2015-06-07 21:15:53 -05:00
Cheridan
2a0595b015
Merge pull request #9823 from SvartaSvansen/detach-from-kill
...
Fixes mob aggression. Just a patch.
2015-06-07 21:10:39 -05:00
Incoming
bff351c555
Intergrates lizard parts into dna stuff so changelings can properly steal them.
...
Turns all the lizard options into one associated list instead of their own vars, for tidiness
Shuffles horns behind frills in terms of layering
2015-06-07 21:05:34 -04:00
Xhuis
700c461422
FEATURE FOUR: Bulldog shotgun darts
2015-06-07 13:08:17 -04:00
KorPhaeron
f70c6d91f4
Fixed indent
...
Those strange grey lines confused me I am a simple person
2015-06-07 10:49:34 -05:00
spasticVerbalizer
53d5ff4f39
Prevents 'unable to speak' spam on empty message by moving .silent check (chem mute) to can_speak_vocal
2015-06-07 17:20:38 +02:00
Iamgoofball
25c3832671
Adds trekchems to the Mediborgs.
2015-06-07 04:52:55 -07:00
AnturK
53b32b17e8
Small update
2015-06-07 13:45:06 +02:00
Remie Richards
bca9c627ee
Merge pull request #9767 from Iamgoofball/patch-71
...
Re-adds kekchems
2015-06-07 12:38:33 +01:00
Iamgoofball
988ff28734
adds panel open icons for the new buildables
2015-06-07 03:55:28 -07:00
bananacreampie
d35c55dffd
Adds several sprites for ghostform
2015-06-07 03:31:40 -04:00
Razharas
0e28326097
Merge pull request #9779 from Cheridan/touching_linda
...
Pressure_resistance Tweaks
2015-06-07 04:57:52 +03:00
Iamgoofball
a9c25caef3
forgot the new admin debug verb
2015-06-06 18:50:14 -07:00
Iamgoofball
8aa79e1f1c
fixes and changes
2015-06-06 18:40:38 -07:00
SvartaSvansen
5d8ee84f12
Fixes mob aggression. Just a patch.
2015-06-06 21:26:09 -04:00
Cheridan
46acc2a55d
REMOVES CABLE CUFF
2015-06-06 16:21:41 -05:00
Iamgoofball
2ffbd75e08
whoops
2015-06-06 14:17:25 -07:00
Cheridan
cdd0dbe05b
Removes Cyborg Per-Active Module Powerdrain
2015-06-06 15:50:08 -05:00
Iamgoofball
21e4ae4b93
insert time for gibber now effected by upgrades, fixes, RECYCLER NOW MORE EFFICIENT
2015-06-06 13:28:59 -07:00
Iamgoofball
3c1a0dd0d5
SMARTFRIDGE, SEED EXTRACTOR, and MONKEY RECYCLER are now buildable. ORE REDEMPTION MACHINE can now be upgraded.
2015-06-06 12:47:11 -07:00
Incoming
6ad36c7bd3
Clears conflicts. As a matter of necessity reverts #9432 . Sorry :(.
2015-06-06 14:56:09 -04:00
AnturK
5803124332
Adds Cablecuff/Zipties sound Hallucination
...
Adds some other sounds
Adds Bolted doors hallucination
Adds Speech/Radio hallucination
2015-06-06 18:09:16 +02:00
phil235
ccd4137a9d
Merge pull request #8974 from kingofkosmos/mopbucket
...
Mopping with just a bucket
2015-06-06 13:18:07 +02:00
xxalpha
9cb1061bfb
Fixed hacking from inside machines and more.
2015-06-06 11:34:12 +01:00