5d97f324fc
Update xenobiology.dm
2016-12-08 10:18:18 +13:00
98f45f8883
Fixes lore
2016-12-07 15:16:14 -06:00
b957fd606b
Fixes bug with secondary Chaplain Null Rods not being morphable. ( #21921 )
...
* Cures multiple nullrod syndrome.
* Just .dme change
2016-12-04 21:22:46 -06:00
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
2c82b2d65e
The time left on a shuttle call/recall modifies with security level. ( #21906 )
...
* The time left on a shuttle call/recall will now correctly modify with changes in the alert status.
As added functionality Code Green shuttle calls no longer need a reason (though you can still give one) and take 20 minutes to arrive.
* Takes out the fun part (for now)
2016-12-04 18:47:17 +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
f3acff4706
Adds a ckey whitelist, stripping out some dead code ( #21875 )
...
* Adds a whitelist, stripping out some dead code in the process
Old job whitelist that wasn't used has been removed.
Config has been repurposed, uncomment USEWHITELIST, only ckey's in
admins.txt or whitelist.txt in the config will be allowed to connect to
the server
* More examples
* Add a guy
* Update whitelist.txt
* Put him in
2016-12-04 15:33:15 +11:00
4ed00ae723
Merge pull request #21901 from ChangelingRain/hotheruntime
...
Fixes robot modules runtime!
2016-12-03 18:04:51 -06:00
62e5f34d41
fix ( #21894 )
2016-12-03 17:25:05 -05:00
4993e2146b
Merge pull request #21888 from XDTM/VineCodeScaresMe
...
Fixes a couple of kudzu bugs
2016-12-03 21:26:17 +04:00
628f1fffe2
)
2016-12-03 17:05:08 +01:00
26b951d917
Fixes fixes
2016-12-03 16:57:37 +01:00
5fdacaa70d
Merge pull request #21874 from MrStonedOne/patch-266
...
Cid Randomizer Detector will not check webclients
2016-12-04 01:07:13 +13: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
19513c398c
updates
2016-12-02 19:38:02 -08: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
f38469b997
Easy peasy fix ( #21878 )
2016-12-02 14:17:44 -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
06242ab811
Merge pull request #21865 from ExcessiveUseOfCobblestone/patch-5
...
Fixes Revolver not being able to be redescribed
2016-12-02 05:02:17 -06:00
e57eac4ffd
Proper color init
2016-12-02 10:29:26 +01:00
09ea5ad2e5
w_class now uses defines
2016-12-01 21:33:14 -08:00
5f4eb139e6
Merge pull request #21868 from Mervill/quicklint
...
Quick code lint
2016-12-01 23:04:56 -06: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
a64f7a9df1
Merge pull request #21862 from kevinz000/refines-my-defines
...
optimumtact commented an hour ago: CHERI, THEY DIDN"T USE THE DEFINE
2016-12-02 15:42:07 +13:00
fc8d1d6be3
Fixed bugs
2016-12-02 00:46:49 +01: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
5f722df728
Cid Randomizer Detector will not check webclients
...
or any client type that isn't seeker.
The randomizer doesn't work on the webclient, and it wouldn't matter anyways because the webclient's cid is worthless.
2016-12-01 00:45:49 -08:00
95ea967a7b
Admins can bypass webclient block
...
There is always the DD dropdown to flat out disable the webclient
2016-12-01 00:31:19 -08: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
d83f68ee66
das ist verboten
2016-11-30 20:08:24 -08:00
01d4232570
Remove slash from end of type refs/defs
2016-11-30 19:23:15 -08:00
b30d0a5782
Fixes Revolver not being able to be redescribed
...
/obj/item/weapon already cover this so not sure why the revolver had its own.
2016-11-30 21:25:23 -05:00
544060f527
return 01010101
2016-11-30 15:48:27 -08:00
ca894aa845
Merge pull request #21801 from Cyberboss/CloseTheDamnThings
...
MC/SS Shutdown. Tguis now close on world reboot
2016-12-01 12:12:38 +13: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
oranges
KorPhaeron
Firecage
Joan Lung
Incoming5643
Pieter Vlasblom
Mervill
Jordie
Cheridan
XDTM
Razharas
Cyberboss
kevinz000
MrStonedOne
ExcessiveUseOfCobblestone