551ede6d35
Kills all remaining text pronoun macros ( #21916 )
...
* Kills all remaining text pronoun macros
* review your own code
* oh right one further
* more
* \
2016-12-04 21:32:31 +01:00
2da5d58156
Prevent people from abusing certain aspects of the game by keeping alert prompts open ( #21914 )
2016-12-04 18:30:34 +01:00
deb718e876
Merge pull request #21899 from ChangelingRain/slabsgoinpockets
...
Starting servants may get their slab in a pocket instead of always in their backpack
2016-12-04 23:13:31 +13:00
c304c5f9d7
Merge pull request #21896 from Cyberboss/patch-3
...
Another bad addtimer
2016-12-04 23:12:57 +13:00
3f68bd7202
Merge branch 'master' into a_intent
...
Conflicts:
code/modules/mob/mob_defines.dm
2016-12-04 00:38:37 -08:00
4a37f57e7c
Merge pull request #21911 from Mervill/m_intent
...
m_intent now uses defines
2016-12-04 19:34:42 +11:00
4ed00ae723
Merge pull request #21901 from ChangelingRain/hotheruntime
...
Fixes robot modules runtime!
2016-12-03 18:04:51 -06:00
481cc07dcf
m_intent now uses defines
2016-12-03 00:25:44 -08:00
d4a49d509d
added INTENT_NEXT
2016-12-03 00:08:55 -08:00
0972f78800
a_intent now uses defines
2016-12-02 22:27:30 -08:00
c2e2440953
Merge branch 'master' into w_class
...
Conflicts:
code/game/objects/items/weapons/twohanded.dm
2016-12-02 21:44:24 -08:00
ca6ffdba40
Merge pull request #21866 from Mervill/slashes_deux
...
Remove slash from end of type refs/defs
2016-12-03 15:56:10 +11:00
047f885069
Merge pull request #21869 from Mervill/ventcrawler
...
Ventcrawler var now uses a define for it's options
2016-12-03 15:56:02 +11:00
a25202f2a2
Fixes robot modules runtime!
2016-12-02 17:53:59 -05:00
1fd4010b3c
Starting servants may get their slab in a pocket instead of always in their backpack
2016-12-02 17:07:19 -05:00
ed2dcc3424
Why can't any of us find all these things
2016-12-02 12:54:10 -05:00
0fc959d694
Improves Geis binding resist ( #21846 )
...
* Improves Geis binding resist
* rrrrgh
* FINE LIMIT IT OKAY
2016-12-02 12:56:31 +01:00
09ea5ad2e5
w_class now uses defines
2016-12-01 21:33:14 -08:00
cae7ac9466
Merge pull request #21859 from XDTM/BlueFix
...
Fixes bluespace golem's teleport
2016-12-01 23:00:03 -06:00
79ff9a8f0b
[READY]Lollipops, gumballs, and a cyborg module that shoots them out! ( #21782 )
...
* lollipop
* ...
* Update snacks_other.dm
* Update snacks_other.dm
* Update snacks_other.dm
* Update snacks_other.dm
* stuffs
* itallworksnow
* updates
* mfw kor caught me
* wew
* completed.
* sprites
* thisshouldworkmaybeprobablyidunno
* ...
* Update robot_items.dm
* projectiles
* Update robot_items.dm
* ...
* fuckingnames
* Update robot_items.dm
* .
* ..
* ...
* spamchecking
* ..()
* ..
* ..
* ..
* Update robot_items.dm
* defines refines 2
* Update robot_items.dm
2016-12-02 15:42:51 +13:00
b29f1eb067
Makes using the cheat engine to remove darkness or ai static harder
2016-12-01 14:38:28 -08:00
89d3752276
Merge pull request #21584 from RemieRichards/swarmer_boss
...
Adds a new boss: Swarmer Swarm [Now a Ruin]
2016-12-01 07:47:54 -06:00
a5ae025549
Replaces "specflags" with "species_traits" ( #21851 )
...
* Replaces "specflags" with "species_traits"
* this will do
2016-12-01 21:16:33 +13:00
11029c86de
Merge pull request #21853 from ExcessiveUseOfCobblestone/areyouokgrab
...
Fixes CtrlClicking Grab Exploit
2016-12-01 21:09:44 +13:00
726a527244
Ventcrawler var now uses a define for it's options
2016-11-30 20:28:04 -08:00
01d4232570
Remove slash from end of type refs/defs
2016-11-30 19:23:15 -08:00
2102859506
Merge pull request #21813 from kevinz000/fuck_v2
...
[READY]Probably will fix hostile flying mobs not attacking people
2016-11-30 16:51:49 -06:00
800e0777be
fix
2016-11-30 22:30:49 +01:00
13e781a308
Some shitcode tried to escape. @Shadowlight123 caught it.
2016-11-30 12:50:16 -08:00
1f8d998600
Improvements and fixes
2016-11-30 12:50:15 -08:00
76e1c6916f
VV refactor
2016-11-30 12:49:21 -08:00
b5578df27d
corrects some defs without leading slash ( #21843 )
2016-11-30 20:05:14 +13:00
1f8546bbaa
Revert "carbon mob bullet act now checks it's target zone exists before continuing" ( #21825 )
2016-11-30 00:28:53 -05:00
e6ffc1cf57
citrus still not happy, must make happy
2016-11-29 23:09:47 -05:00
185ed7400b
makes citrus happy
2016-11-29 23:08:15 -05:00
f7be2bb768
Praise
2016-11-29 22:49:42 -05:00
401c35da74
Merge pull request #21822 from XDTM/PlasmaGolemsBurn
...
Splits the RESISTTEMP flag, some minor changes to golems.
2016-11-29 21:39:49 -05:00
410fd08432
Merge pull request #21824 from erwgd/PmanRandNameFix2
...
Fixes plasmamen spawning with no name
2016-11-29 21:36:39 -05:00
0d3fdf5dfb
Merge pull request #21804 from AdamElTablawy/patch-13
...
gives syndimedborg a fucking medigun so it's not useless
2016-11-29 16:51:56 -06:00
ef6aa7db0a
Merge pull request #21800 from Shadowlight213/changeturffix
...
Fixes lavaland cave generation creating airless turfs.
2016-11-29 17:08:09 +13:00
1b404d6199
restored code for plasmaman/random_name proc
2016-11-28 20:51:32 +00:00
64358135f1
Several things
2016-11-28 21:44:09 +01:00
2d2e0fddd5
Merge pull request #21742 from tgstation/revert-21638-this_isnt_advanced_darkness_this_is_REGULAR_darkness
...
Revert "Human nightvision"
2016-11-29 09:10:37 +13:00
3943ceedbd
fixed
2016-11-27 23:27:14 -08:00
23906c811a
Adds more golem types, adds golem shell creation with adamantine slimes ( #21708 )
...
* Diversifies golems
* Golems
* fixes a bug
* Glass golem + species bullet_act support
* Glass shatter
* More golems
* Final changes
* Added to xenobio
* update
* minor space
* Totally bananas
* silly me
* what Joan said
* Updated titanium, plastitanium, and alloy golems.
2016-11-28 18:34:08 +13:00
b7886794c9
gives syndimedborg a fucking medigun so it's not useless
2016-11-27 20:26:16 -08:00
bd192ed901
Fixes lavaland cave generation creating airless turfs.
2016-11-27 14:53:37 -08:00
639edc9c8c
Merge pull request #21773 from kevinz000/fuck
...
[READY]Fixes movement speeds
2016-11-27 17:19:08 -05:00
d5bff39b71
Merge pull request #21786 from optimumtact/litanyoffailures
...
Fixes all remaining addtimers missed
2016-11-27 21:47:44 +11:00
0b7ceca654
Merge pull request #21769 from erwgd/PmanRandnameFix
...
Plasmaman random name adjustments
2016-11-27 23:08:49 +13:00
Joan Lung
Pieter Vlasblom
oranges
Mervill
Jordie
Cheridan
Cyberboss
kevinz000
MrStonedOne
XDTM
ExcessiveUseOfCobblestone
erwgd
AdamElTablawy
Shadowlight213