Firecage
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
Cheridan
d402f7620c
Merge pull request #21919 from ChangelingRain/tileproselytizing
...
You can now proselytize floor tiles
2016-12-04 20:20:18 -06:00
Joan Lung
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
GunHog
b283fd04e8
Advanced Mop can now make its own water ( #21903 )
...
* Advanced Mop can now make its own water
The Advanced Mop can now produce its own water at a rate of 1 unit per
process().
The advanced mop now has a switch to toggle wetting itself.
* Tweaks
Uses the proper return ..()
Rearranged the text a little.
2016-12-04 18:42:23 +01:00
oranges
c304c5f9d7
Merge pull request #21896 from Cyberboss/patch-3
...
Another bad addtimer
2016-12-04 23:12:57 +13:00
Mervill
3f68bd7202
Merge branch 'master' into a_intent
...
Conflicts:
code/modules/mob/mob_defines.dm
2016-12-04 00:38:37 -08:00
Joan Lung
12aa57fd7e
You can now proselytize floor tiles
2016-12-03 17:03:29 -05:00
Mervill
481cc07dcf
m_intent now uses defines
2016-12-03 00:25:44 -08:00
WJohn
96c93f6b38
Merge pull request #21870 from KorPhaeron/cyborg_tools
...
Engineering Cyborg Tools Now Use the Default Sprites
2016-12-03 02:53:11 -05:00
Mervill
0972f78800
a_intent now uses defines
2016-12-02 22:27:30 -08:00
Mervill
c2e2440953
Merge branch 'master' into w_class
...
Conflicts:
code/game/objects/items/weapons/twohanded.dm
2016-12-02 21:44:24 -08:00
Jordie
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
Cyberboss
65b2c6b83d
Fine fine
2016-12-02 16:27:11 -05:00
Cyberboss
0e9a26215c
And another
2016-12-02 12:59:07 -05:00
Cyberboss
7d525c9c3e
And another
2016-12-02 12:56:42 -05:00
Mervill
09ea5ad2e5
w_class now uses defines
2016-12-01 21:33:14 -08:00
kevinz000
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
Joan Lung
a5ae025549
Replaces "specflags" with "species_traits" ( #21851 )
...
* Replaces "specflags" with "species_traits"
* this will do
2016-12-01 21:16:33 +13:00
KorPhaeron
f77cd58b70
Cyborg Tools
2016-12-01 00:10:27 -06:00
Mervill
01d4232570
Remove slash from end of type refs/defs
2016-11-30 19:23:15 -08:00
Mervill
b5578df27d
corrects some defs without leading slash ( #21843 )
2016-11-30 20:05:14 +13:00
ExcessiveUseOfCobblestone
f035c1a340
Give your unique weapons some backstory! ( #21816 )
...
* Description Editing
* Fixed because i'm a dummy
* Halves the character limit for descriptions
* Lowers it even more, surely this will suffice.
* makes citrus smile
* dumb citrus
* dumb cobby
* Fixes bug where it gives empty name/desc on pressing cancel.
2016-11-30 18:53:36 +13:00
Jordie
d5bff39b71
Merge pull request #21786 from optimumtact/litanyoffailures
...
Fixes all remaining addtimers missed
2016-11-27 21:47:44 +11:00
Xhuis
118fca35b8
Cleanup on aisle 892 ( #21745 )
...
* Plastic explosives now delete upon suicide
* Removes some old code
* Allows resisting out of straight jackets
* Verifies roller bed dock functionality
* Fixes lava's article
* Fixes Syndicate pinpointers being stuck to one mode
* Addresses some of @phil235's concerns
* Removes the Highlander left standing message
2016-11-27 22:59:34 +13:00
oranges
af7e6d1323
Fixes all remaining addtimers missed
2016-11-27 08:31:07 +00:00
oranges
f67cd8e628
Merge pull request #21707 from swindly/wetleather
...
Makes drying racks dry leather
2016-11-25 22:06:30 +13:00
kevinz000
87dbd65811
[READY]] FLIGHTPACKS (AKA cooler, better, and technological wings with a unique gimmick!) ( #20860 )
...
* vroom
* wew
* a
* b
* morestuff
* .
* a
* .
* .
* basicsprites+extend/retract
* ...
* .
* thanks travis
* woops
* thankstravisv2
* redundence
* ishouldstopmakingsomanygoddamncommits+empdamage
* stuff
* ..
* ion_trails
* fixes_conflict_1
* fix
* compilesnow
* .
* fuck
* WIP: Multi Step Assembly
* thismightfixitthismightnot
* shoe-attachment
* noselfremoval
* wooops
* tweaksandcrashing
* runtimes
* runtimesfuntimes+crash update 1
* thisprobablywontcompile
* stillwip
* githubPLEASEWORK
* fixes conflicts 3/3
* REFACTORSUNTESTED
* fixingconflicts2
* fixingconflicts3/3
* updates
* stuffs
* ...
* stillWIP
* stufffs
* .
* ..
* runtimesfuntimes2
* stuffs2
* conflictfix
* ...
* fuck
* fix
* bah merge conflicts
* knockback_testing1
* conflictfixing...
* mergeconflicts
* plop
* socloseyetsofar
* tweaksandfixes
* conflicts
* fix
* fixes
* fix
* woops
* woops2
* hotfix
* ...
* flufftextandfixes
* test
* ..
* fix1/2
* stuff
* finallysomeoneteachesmehowtofixthisshit
* FIX
* why
* .
* bitflagsshitflags1
* bitflags-shitflags2
* bitflags-shitflags2
* bitflags_shitflags_4
* autofloating
* minerbuffgetthepun?
* notouchingfloors
* ...
* .
* f l o a t
* kek
* kek
* fixes
* fixes2
* sprites
2016-11-25 13:26:43 +13:00
swindly
7c2780275d
drying rack
2016-11-23 22:22:58 -05:00
oranges
3c7f7582f1
Merge pull request #21680 from KorPhaeron/lavabase2
...
Syndicate Lava Base Remap
2016-11-24 10:28:57 +13:00
kevinz000
a898c0b8d0
I accidently made flashbangs divide by zero. ( #21687 )
...
* Update flashbang.dm
* fix
* Update flashbang.dm
2016-11-24 10:26:29 +13:00
swindly
ad4b6cedd0
drying
2016-11-23 13:09:00 -05:00
KorPhaeron
9976f03112
Science Channel for Shaft Miners
2016-11-22 00:42:34 -05:00
KorPhaeron
3c769285e4
Syndicate Lava Base Remap
2016-11-21 20:37:05 -06:00
swindly
3cd20e06e8
Allows more things to be put in the microwave ( #21650 )
...
* more items can be inserted
* tweaked explosions
* intent
2016-11-22 11:56:02 +13:00
Jordie
8beebf7aba
Merge pull request #21634 from Crushtoe/sprite-and-desc
...
Adds and Fixes Sprites, Tweaks Null Rod Descriptions
2016-11-22 09:15:01 +11:00
Joan Lung
5224512d55
Replaces Servant cyborg emagged modules with some limited scripture and tools ( #21632 )
...
* Replaces Servant cyborg emagged modules with some limited scripture and tools
* not THAT limited
* sorry standard borg
* bugfix
2016-11-20 17:51:11 +01:00
oranges
6c1966d393
Merge pull request #21612 from KorPhaeron/ssreligion
...
Ssreligion
2016-11-20 14:54:12 +13:00
oranges
be6450e166
Merge pull request #21617 from PKPenguin321/patch-5
...
fixes more wacky punctuation
2016-11-19 19:01:02 +13:00
Crushtoe
3bfacd6771
Tweaks various item descriptions
...
- The USA bedsheet sprite now properly displays.
- Tweaked some null rod descriptions.
- Added some tips.
- Added black bedsheet sprite to neck.
2016-11-18 22:17:33 -06:00
Crushtoe
e1d3e42254
Tweaking descriptions.
...
Tweaks some holy weapon descriptions.
2016-11-18 20:20:19 -06:00
oranges
1c87147b3d
Merge pull request #21575 from Crushtoe/master
...
Adds new icon for the null rod's reaper's scythe variant.
2016-11-19 13:42:18 +13:00
kevinz000
29e654d8a9
[READY]Fixes Peacekeeper Cyborg Chemicals ( #21512 )
...
* Update toxin_reagents.dm
* Update holosign.dm
* Update holosign_creator.dm
* Update holosign_creator.dm
* Update holosign.dm
* Update robot_items.dm
* Update toxin_reagents.dm
* Update toxin_reagents.dm
* fixes
2016-11-19 13:35:30 +13:00
Shadowlight213
008689c61c
Adds AI Integrity restorer to program datums, various modular computer improvements ( #21546 )
...
* Ports AI restorer to modular computars
* mostly done. working on qdel improvments
* undoes testing flag
* undoes gc stuff
* Fixes id card module name
* memes
2016-11-19 13:33:39 +13:00
Joan Lung
7c25b959de
Refactors robot modules ( #21572 )
...
* Refactors robot modules
* no message
* ok
* mini why
* this is what you wanted, right?
* try to remember
* I can't code
* a good coder
* whirring
* bleh
* less sounds
* math is for nerds
* now it will
2016-11-18 23:12:32 +01:00
Cheridan
9c967840eb
Merge pull request #21590 from Cyberboss/ChangeTheGoddamnValues
...
Fixes metal duplication when using an RCD to make high security airlocks
2016-11-18 05:47:52 -06:00
AnturK
da6d8372d5
Merge pull request #21592 from swindly/sharp
...
Fixes sharpness checks for animal hides and balloons
2016-11-18 11:55:54 +01:00
PKPenguin321
6c979b66cc
fixes more wacky punctuation
2016-11-17 20:23:23 -08:00
KorPhaeron
969abebade
Adds a religion subsystem
2016-11-17 21:01:22 -06:00
swindly
b0e4481723
sharpness
2016-11-16 19:59:05 -05:00
Joan Lung
f162d4d84a
Refactors scripture quickbind ( #21563 )
...
* Refactors scripture quickbind
* =
2016-11-17 12:28:57 +13:00
