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
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
0fc959d694
Improves Geis binding resist ( #21846 )
...
* Improves Geis binding resist
* rrrrgh
* FINE LIMIT IT OKAY
2016-12-02 12:56:31 +01:00
5d56eeb96c
oh, and this
2016-12-01 21:39:02 -08:00
09ea5ad2e5
w_class now uses defines
2016-12-01 21:33:14 -08: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
a5ae025549
Replaces "specflags" with "species_traits" ( #21851 )
...
* Replaces "specflags" with "species_traits"
* this will do
2016-12-01 21:16:33 +13:00
f77cd58b70
Cyborg Tools
2016-12-01 00:10:27 -06:00
01d4232570
Remove slash from end of type refs/defs
2016-11-30 19:23:15 -08:00
87b1755a8c
Merge pull request #21847 from ChangelingRain/debrisbutton
...
Fixes the auto follow debris button
2016-11-30 16:59:10 -06: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
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
b3a809d21a
Fixes the auto follow debris button
2016-11-29 11:48:16 -05:00
7b53791a1d
Merge pull request #21799 from bgobandit/fixingmyshit
...
Fixes urinals.
2016-11-29 17:14:15 +13: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
b82f4111be
New Devil Obligation: Dance Off ( #21765 )
...
* New Devil Obligation: Dance Off
New Devil Spell: Summon Dancefloor
* Typofix
* typofix round 2
2016-11-28 23:04:45 +13: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
468d900ef7
Fixes urinals
2016-11-27 16:39:39 -05:00
d5bff39b71
Merge pull request #21786 from optimumtact/litanyoffailures
...
Fixes all remaining addtimers missed
2016-11-27 21:47:44 +11:00
ed11869a79
Gives cyborgs the ability to open morgue trays ( #21747 )
...
* Gives cyborgs the ability to open morgue trays
* Small balance changes
2016-11-27 23:07:40 +13:00
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
af7e6d1323
Fixes all remaining addtimers missed
2016-11-27 08:31:07 +00:00
f67cd8e628
Merge pull request #21707 from swindly/wetleather
...
Makes drying racks dry leather
2016-11-25 22:06:30 +13:00
c0ef5e59f7
Revert "Human nightvision"
2016-11-25 15:21:33 +13:00
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
6dc56abd5e
Human nightvision ( #21638 )
...
* Human nightvision
Humans can see in the dark a little bit around themselves.
-Add pictures here-
Forces clients onto 510 and suggests clients upgrade to 511 in the default config. The suggestion is still commented out but forcing clients to 510+ is mandatory.
Ghosts and brains now actually render the default HUD instead of skipping the whole process. Dead mobs will show their fullscreens. All of the existing ones will skip rendering to dead mobs to keep the existing behavior of not rendering the brute/blindness screens.
Fixes #17389
Probably fixes #19248 need to test
* Darker human nightvision it is
2016-11-25 13:05:41 +13:00
7c2780275d
drying rack
2016-11-23 22:22:58 -05:00
3c7f7582f1
Merge pull request #21680 from KorPhaeron/lavabase2
...
Syndicate Lava Base Remap
2016-11-24 10:28:57 +13:00
a898c0b8d0
I accidently made flashbangs divide by zero. ( #21687 )
...
* Update flashbang.dm
* fix
* Update flashbang.dm
2016-11-24 10:26:29 +13:00
ad4b6cedd0
drying
2016-11-23 13:09:00 -05:00
9d00e4ff89
Merge pull request #21683 from KorPhaeron/cooperation
...
Science Channel for Shaft Miners
2016-11-23 08:10:05 -06:00
c132e1d68a
Makes golems different, also fixes a couple of bugs ( #21656 )
...
* Diversifies golems
* Golems
* fixes a bug
* Carbon proc
* Spacing
* oops
2016-11-23 12:42:15 +13:00
c8316aa019
Fixes airlock security levels messing with their health ( #21674 )
...
* Adds the max_integrity modifier proc
* Fixes #21581
2016-11-23 12:16:38 +13:00
a592e68f87
Viewers always returns a list ( #21676 )
2016-11-22 17:23:40 -05:00
9976f03112
Science Channel for Shaft Miners
2016-11-22 00:42:34 -05:00
3c769285e4
Syndicate Lava Base Remap
2016-11-21 20:37:05 -06:00
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
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
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
6c1966d393
Merge pull request #21612 from KorPhaeron/ssreligion
...
Ssreligion
2016-11-20 14:54:12 +13:00
be6450e166
Merge pull request #21617 from PKPenguin321/patch-5
...
fixes more wacky punctuation
2016-11-19 19:01:02 +13:00
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
e1d3e42254
Tweaking descriptions.
...
Tweaks some holy weapon descriptions.
2016-11-18 20:20:19 -06:00
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
49d307ee20
Merge pull request #21601 from RandomMarine/justmorguethings
...
Adds in-game explanation of the morgue lights
2016-11-19 13:40:36 +13:00
f2808303ee
Tweaks to the snakebox ( #21530 )
...
* The word snake makes no sense to me now
* Fixes volume
* Fixes spam
* Extra memes
* incap check
* Compile before commit
* Roast me Travis
* ... And moved
* Timing changeling
* Cheri has spoken
2016-11-19 13:36:07 +13:00
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
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
WJohn
Mervill
Jordie
Joan Lung
kevinz000
KorPhaeron
Cheridan
MrStonedOne
ExcessiveUseOfCobblestone
oranges
Remie Richards
XDTM
bgobandit
Xhuis
MrPerson
swindly
Cyberboss
Crushtoe
Shadowlight213