Commit Graph

8721 Commits

Author SHA1 Message Date
Jordie
d5bff39b71 Merge pull request #21786 from optimumtact/litanyoffailures
Fixes all remaining addtimers missed
2016-11-27 21:47:44 +11:00
Xhuis
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
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
MrPerson
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
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
Cheridan
9d00e4ff89 Merge pull request #21683 from KorPhaeron/cooperation
Science Channel for Shaft Miners
2016-11-23 08:10:05 -06:00
XDTM
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
Cyberboss
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
Cyberboss
a592e68f87 Viewers always returns a list (#21676) 2016-11-22 17:23:40 -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
oranges
49d307ee20 Merge pull request #21601 from RandomMarine/justmorguethings
Adds in-game explanation of the morgue lights
2016-11-19 13:40:36 +13:00
Cyberboss
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
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
RandomMarine
40b666f6cb adds morgue instructions 2016-11-17 01:47:27 -08:00
swindly
b0e4481723 sharpness 2016-11-16 19:59:05 -05:00
coiax
ec294edf34 Malf AI doomsday countdown is better formatted (#21567)
🆑 coiax
fix: The observer visible countdown timer for the malfunctioning AI
doomsday device is now formatted and rounded appropriately.
/🆑

It's centred, and no longer has decimals.
2016-11-17 12:32:37 +13:00
Joan Lung
f162d4d84a Refactors scripture quickbind (#21563)
* Refactors scripture quickbind

* =
2016-11-17 12:28:57 +13:00
Cyberboss
800327bb51 Fixes #21582 2016-11-16 18:03:29 -05:00
Crushtoe
013ea91a2a Adds new null rod sprite for the reaper's scythe.
🆑 Crushtoe
- imageadd: Adds new in-hand and item sprite for the reaper's scythe.
/🆑
2016-11-15 18:34:21 -06:00
swindly
9f206a292b Allows dice to be rigged and adds microwave_act() (#21545)
* gary needs a new pair of shoes

* -1 -> FALSE

* microwave act

* does that stuff

* fixes more stuff
2016-11-16 13:14:36 +13:00
ExcessiveUseOfCobblestone
f01862c208 hotfixes icons for HoG fluff-structures (#21556)
WHO DID THIS
2016-11-15 11:15:37 -06:00
Incoming5643
46b5d6860c Adds three new rare dice to the game (#21547)
* Adds two new rare dice to the game, the 4d d6 and the 8b d20

* adds the space cube
2016-11-16 00:19:16 +13:00
oranges
fed780fa9b Merge pull request #21540 from Supermichael777/revert-21014-atmosgrenades
Revert "Atmos Grenades"
2016-11-15 16:40:35 +13:00
oranges
d11bb7258a Merge pull request #21529 from Cyberboss/DoTheTruffleShuffle
Storage rustling cleanup/refactor
2016-11-15 16:39:30 +13:00
kevinz000
6581ae2b49 [READY]Slightly buffs Peacekeeper Cyborg Energy Barriers (#21513)
* Update holosign_creator.dm

* Update holosign.dm

* Update holosign.dm

* Update holosign_creator.dm
2016-11-14 19:10:30 +13:00
oranges
646d871739 Merge pull request #21514 from kevinz000/flashbangsopplsnerf
[READY] Flashbangs now ignores same-tile protection properly
2016-11-14 19:06:49 +13:00
uraniummeltdown
3bd538a1b3 Adds raw TC to uplink and 10mm ammo variants (#21498)
* adds raw telecrystals to uplink, can be used to refill uplinks and uplink implants, adds 10mm variants to uplink for traitors and nuke ops

* grammar
2016-11-14 19:02:40 +13:00
Supermichael777
5d9bc48034 Revert "Atmos Grenades" 2016-11-13 19:44:29 -05:00
Cyberboss
0ff7c62984 Removes duplicate fingerprinting 2016-11-13 19:09:47 -05:00