Commit Graph

3618 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
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
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
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
KorPhaeron
3c769285e4 Syndicate Lava Base Remap 2016-11-21 20:37:05 -06: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
oranges
6c1966d393 Merge pull request #21612 from KorPhaeron/ssreligion
Ssreligion
2016-11-20 14:54:12 +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
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
KorPhaeron
969abebade Adds a religion subsystem 2016-11-17 21:01:22 -06: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
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
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
Cyberboss
316070be13 Wooweee feeling rustled today 2016-11-13 12:07:04 -05:00
kevinz000
9723cbc0bf woops 2016-11-12 23:36:54 -08:00
kevinz000
592fc06e30 Update flashbang.dm 2016-11-12 16:27:12 -08:00
Cheridan
373604639d Merge pull request #21439 from Aloraydrel/CE_BELT
Adds an analyzer to the CE's belt
2016-11-10 12:21:56 -06:00
Shadowlight213
332598e71d Attacking someone with an extinguisher on help intent only stops it if the safety is off (#21402)
* Removes attacking someone with a fire extinguisher on help intent with safeties on doing nothing.

* Changes so the attack is only blocked if the safety is off.

* FALSE
2016-11-10 09:34:12 +13:00
Razharas
3d3c28efa2 Merge pull request #21407 from optimumtact/martialruntimes
Improves stunbaton code to prevent runtimes and a miscount in charge
2016-11-09 03:26:55 +04:00
Mervill
9ea955b85f Lint (#21393)
* icon, icon_state defined twice

* desc defined twice

* desc defined twice

* desc, icon_state defined twice

* icon_state, name defined twice

* item_state defined twice

* gender defined twice

* stop_automated_movement_when_pulled defined twice

* attacktext defined twice

* speak_emote defined twice

* flying defined twice

* item_state defined twice

* speak_chance defined twice

* attack_sound defined twice (x2)

* icon_state, item_state defined twice

* icon_state defined twice

* Revert "desc defined twice"

This reverts commit 18d74f442441078a7d8e8cfaddbef1c4646b6bb9.

* desc defined twice

* Revert "desc defined twice"

This reverts commit e167c0812c94a96dfb3f6888c77cee868cc37c03.

* desc defined twice
2016-11-08 13:55:30 +13:00
oranges
0844b8efed Improves stunbaton code to prevent runtimes and a miscount in charge
Previously if the final stun from a stunbaton used all the power in the
cell (putting it below hitcost) it would not properly return the actual
value of the cell.use call, so you would use the energy but not properly
get the stun

The logic of the deductcharge proc has been refactor to avoid this by
explicitly returning the value of cell.use call no matter if the stun
baton is switched off or not

The code was also cleaned slightly to improve readability
2016-11-07 23:55:19 +00:00
oranges
2a8b848f9b Merge pull request #21341 from swindly/its
Fixes some grammatical errors
2016-11-08 09:27:53 +13:00
Aloraydrel
c30f34ad90 Analyzer to the CE belt 2016-11-07 08:00:54 -05:00
Militaires
889c82a247 CQC tweaks, improvements and fixes [and adds and utilizes martial art blocks) (#21201)
fixes an abusive exploit and makes 2 combos easier to use, increases cqc harm damage, adds martial art block_chance var which is only activated if you have your throw_mode on for active defense.

baton blocks stun the person attempting the attack too, you can now block batons and then throw or chokehold.

makes tc cost for CQC 13 with all the buffs.
2016-11-07 09:01:41 +13:00
Cheridan
6a885d9500 Merge pull request #21342 from phil235/TransitShit
Fixes transit tubes
2016-11-05 17:21:24 -05:00
PKPenguin321
43692c6bad buffs whetstones (#21339)
makes it so anything sharpened with them becomes is_sharp_accurate
2016-11-05 14:12:20 +01:00
swindly
7330ad5778 bonus fixes 2016-11-02 20:08:19 -04:00
swindly
6feff91f76 it's -> its 2016-11-02 19:26:04 -04:00
phil235
26b8d03b2f Merge branch 'master' of https://github.com/tgstation/-tg-station into TransitShit 2016-11-02 22:57:51 +01:00
phil235
51d1319ed1 Make transit tube code less shit. 2016-11-02 22:55:36 +01:00
phil235
b7efc2cef4 Make energy guns able to use burst fire. (#21005)
* Make energy guns able to use burst fire.

* Changed obj/item/weapon/gun/projectile to /gun/ballistic and the name of the folder from "projectile" to "ballistic" to avoid confusion between actually projectiles and guns.

Syringe gun, energy guns and magic guns can now use burst fire.

* fixing merge conflict shit

* fixing map conflicts

* more map conflict fix

* two tiny fixes.

* tiny tweak

* fixing merge conflicts.
Moving the practice mini egun to the gun module.
Renamed nuclear.dm to energy_gun.dm

* map conflict fixes
2016-11-02 16:16:21 +13:00
Joan Lung
ee76078d16 Merge pull request #21060 from phil235/Color_washing
Adding var/list/atom_colours to /atom .
2016-10-31 21:12:29 -04:00
oranges
6a411a5a97 Merge pull request #21266 from kevinz000/revert1
Reverts Hardlight Bows
2016-11-01 11:31:40 +13:00
phil235
2dc956bea0 Merge branch 'master' of https://github.com/tgstation/-tg-station into Color_washing
# Conflicts:
#	code/game/gamemodes/clock_cult/clock_scripture.dm
#	code/game/gamemodes/clock_cult/clock_structures.dm
2016-10-31 19:59:00 +01:00
Cheridan
2ae59bf7dc Merge pull request #21280 from ChangelingRain/axemeaquestion
Brass windows are now slightly harder to destroy
2016-10-31 11:08:44 -05:00
Cheridan
d169779424 Merge pull request #21273 from bgobandit/immortalization
Adds a suicide message to an object lacking one.
2016-10-31 05:07:59 -05:00
Joan Lung
8cf817cfec Brass windows are now slightly harder to destroy 2016-10-30 11:51:21 -04:00
bgobandit
1999445b4f whoopsies 2016-10-30 04:06:06 -04:00