Commit Graph

131 Commits

Author SHA1 Message Date
CalamaBanana
a37f84fb9b Ports RP Deer taur and adds Elf Ears to Mammals
Ports RP Deer taur and adds Elf Ears to Mammals
2019-06-01 17:28:17 +02:00
deathride58
3feb11f12a Ports the zulie cloak and blackredgold coat donor items from RP 2019-05-28 19:38:08 -04:00
Poojawa
5f358a5a75 Local sune fixes armor without having to do spritework 2019-05-18 23:42:29 -05:00
deathride58
a39dd310ba Merge branch 'master' into muzzled-masks 2019-04-13 17:48:24 -04:00
Poojawa
fb234783a7 muzzle-compatible helmets and masks 2019-04-12 04:00:47 -05:00
Poojawa
30dbc57e75 Labcoats carry mk II hypos, kits hold more 2019-04-11 06:55:57 -05:00
Poojawa
49c518012b Properly account for tauric mode 2019-03-25 04:32:27 -05:00
Poojawa
25d079c4b8 Fixes blood overlay and shield issues for taurs 2019-03-18 03:19:18 -05:00
deathride58
d8f738184b Replaces disarm right click action with tgstation/tgstation#42958 's disarm action, also ports the removal of non-help intent pushing from that same pr 2019-03-04 21:05:50 -05:00
kevinz000
a37684aae2 Update reactive_armour.dm 2019-01-12 10:47:35 -08:00
kevinz000
ac87048678 Update reactive_armour.dm 2019-01-12 10:45:52 -08:00
kevinz000
fc090a462e Update reactive_armour.dm 2019-01-12 10:45:00 -08:00
kevinz000
feeea1ab8c Update reactive_armour.dm 2019-01-12 10:40:16 -08:00
Trilbyspaceclone
687bbb1397 makes them = 2018-12-22 11:36:20 -05:00
Trilbyspaceclone
451dd8948a Update bio.dm 2018-12-22 11:22:48 -05:00
kevinz000
63bf5c54e1 Update reactive_armour.dm 2018-11-28 21:21:48 -08:00
kevinz000
02ec7a38ce Update reactive_armour.dm 2018-11-28 21:16:30 -08:00
kevinz000
a6d9a4f721 Update reactive_armour.dm 2018-11-28 21:14:30 -08:00
deathride58
e0cdd8fb93 Merge pull request #7678 from Trilbyspaceclone/patch-5
[Ready] Nerfs reactive armor a bit.
2018-11-18 07:42:42 -05:00
Poojawa
f03cd4c852 Actually test-fixed taur suits this time 2018-11-10 00:23:42 -06:00
Trilbyspaceclone
462891a68b STEALTH 2018-10-30 18:51:22 -04:00
Trilbyspaceclone
c10602689e "Middle grounds" 2018-10-28 02:19:48 -04:00
Trilbyspaceclone
f4f33042e2 Makes kev more happy!
Feels like hugbox power creep to me
2018-10-28 01:56:22 -04:00
Trilbyspaceclone
3bd12750db 75 + 10 +50 = 135 block... 120 is two riot shields 2018-10-28 01:14:04 -04:00
Poojawa
42b1d03d2a [READY] Tauric full body suits (#7639)
* let's get this back on the table

* split 'em up because sorting memes

* Gets stuff code-ready, sprite work to continue

Engineering / Atmosia / Cheng
Civilian Space
Blood Red / Red and Black
Riot / Armor vests
Radiation / Fire / Atmosia Fire
Bio Suits (Viro/CMO/basic)
ERT / Deathsquad

* It's messy, but it works so w/e

* let there be more tail access

* finishes naga taur spriting

* memes

* super fixes any lingering memes

* leg experiment

* nah, this isn't gunna work.

* poked at canine again

* saving memes

* tweaks some fixes and things

* finished quad suits, added bomb suits for nagas also

* "inconsistant indentation" Byond you fuck

* Take that, byond

* The war on Byond continues

* let's make sure the explorer gear uses fancy sprites

* syndiE ??? wtf did I sleep type
2018-10-18 09:30:37 -07:00
Poojawa
91620218e4 some cherrypicked TG fixes and tweaks 2018-10-12 05:37:36 -05:00
Poojawa
aa8d29fc53 Ensures suit.dm bandits are exempted 2018-10-07 05:36:56 -05:00
Poojawa
a05acf5c7e Finishes sprites, ensures proper equipping
Also blacklists customs that aren't in suit.dmi yet
2018-10-07 04:56:22 -05:00
Poojawa
756f853492 Digitigrade suits base line
All suits have N/S at this point, some have E/W. god this is going to be awful.
2018-10-06 04:43:07 -05:00
deathride58
0ce450eab8 tgstation/tgstation#40662 - Stops using the rad insulation component to provide default rad insulation features in order to save a bit of memory 2018-10-02 19:36:21 -04:00
Poojawa
4ed3ac7b3d Purges Icon_override 2018-09-26 14:27:28 -05:00
Poojawa
284e9d0325 module things, jfc 2018-09-11 07:51:01 -05:00
deathride58
3e18d8208e Updates to tgstation commit 78e471d 2018-07-05 01:22:27 -04:00
deathride58
b1688405d9 and finally, the modules folder. Now I can publish and take a break 2018-07-02 01:19:37 -04:00
CitadelStationBot
1bf74841c7 [MIRROR] Removes reactive incendiary armor from non-admin methods of obtaining (#7050)
* Make incendiary armor aspawn only (#38370)

* Removes reactive incendiary armor from non-admin methods of obtaining
2018-06-10 12:30:57 -07:00
deathride58
2f9e3e403d Hard upstream sync (#6951)
* maps - none of our changes included yet i'll get them in after i finish up the rest of the sync

* sync part 1 - underscore folders in code

* controllers folder

* datums folder

* game folder

* cmon, work

* modules - admin to awaymissions

* cargo to events

* fields to lighting

* mapping > ruins

* rest of the code folder

* rest of the folders in the root directory

* DME

* fixes compiling errors. it compiles so it works

* readds map changes

* fixes dogborg module select

* fixes typo in moduleselect_alternate_icon filepath
2018-05-31 16:03:18 -07:00
KorPhaeron
64ead10924 Fixes reactive repulse armour (#37999) 2018-05-23 21:00:10 -05:00
LetterJay
359d31238d Merge branch 'master' into upstream-merge-37486 2018-05-21 11:59:57 -05:00
LetterJay
931a950adb Merge branch 'master' into upstream-merge-37486 2018-05-21 08:59:32 -05:00
LetterJay
ea9b3622fd Merge branch 'master' into upstream-merge-37476
# Please enter a commit message to explain why this merge is necessary,
# especially if it merges an updated upstream into a topic branch.
#
# Lines starting with '#' will be ignored, and an empty message aborts
# the commit.
2018-05-20 23:11:16 -05:00
deathride58
b0d896a19b Update armor.dm 2018-05-10 23:42:56 -04:00
KorPhaeron
cc8fb19166 Anomaly Armour Research 2018-05-09 15:55:03 -05:00
deathride58
50f8779fc0 Merge branch 'master' into upstream-merge-37486 2018-05-06 07:15:48 +00:00
deathride58
6a07a66cb3 Merge branch 'master' into upstream-merge-37476 2018-05-06 07:07:02 +00:00
kevinz000
3369c804b2 Kills off /obj/item/device (#6561) 2018-04-30 00:06:58 -05:00
vuonojenmustaturska
3f6167d08e Moves several clothing-specific flags from /atom to their proper type 2018-04-28 13:21:48 -05:00
oranges
7d45e045a3 Uppercases slot defines. 2018-04-27 20:14:39 -05:00
Poojawa
b4a7def5ca Hypospray kits and reworks! (#5907)
* Adds Hypospray kits, fixes reagent overlays

Also adds colors to trek chems other than PINK.

* reee admins.txt

* adds the CMO Hypo MK II kit to the CMO's locker

renames the locker overrides as well, because lazy

* grammer gud

* hypo vial fix suggested by Kfive

* Modifies hypospray functions

* Fixed the Hypospray mk.II, is now comprehensive where it must.

* Fixed bugs, including the vending machine problem.

* Either fixed or didn't fix line terminator issues.

* Turns out there were no line ending problems, rather there were literally spaces after some lines, which got removed automatically.

* Forgot a comma.

* Forgot a comma, even though it's in a comment. Good thing I caught it before somebody tried decommenting it.

* Left a line in the alternative reskin function for hypovials. This has been removed since it's unnecessary.

* delay tweaks. otherwise all good.

* reee github

* unneeded \the I thought were purged

* grammar fix, gives MDs and Chemist hypokits

* Makes chem masters able to produce vials

* recompiles tgui

* Update belt.dm
2018-03-21 15:28:06 -05:00
Poojawa
f3a806923c Merge remote-tracking branch 'refs/remotes/origin/master' into beepboop 2018-03-20 23:00:12 -05:00
CitadelStationBot
3d26cd4a6f [MIRROR] Replaced body zone magic strings with defines (#6004)
* Replaced body zone magic strings with defines

* merge conflicts
2018-03-19 21:18:57 -05:00