Commit Graph

162 Commits

Author SHA1 Message Date
Ghom
33931da018 Merge pull request #11013 from r4d6/pickaxe
Add two more pickaxes, Titanium & Plasteel
2020-02-14 19:34:01 +01:00
r4d6
8b68e57de0 Add the pickaxes 2020-02-10 22:02:39 -05:00
kevinz000
01390fa0e0 Merge remote-tracking branch 'citadel/master' into attack_chain 2020-02-10 04:18:02 -07:00
Ghommie
8de11845d5 Removing a troublesome argument from organ/Remove() in favor or using the 'owner' variable 2020-02-02 03:39:49 +01:00
Hatterhat
41a3dc64d5 what 2020-01-29 16:44:01 -06:00
kevinz000
e50eb495df pre attack refactor 2020-01-27 16:30:23 -07:00
Hatterhat
9b9c7c3018 exo nerf 2020-01-19 20:37:31 -06:00
AffectedArc07
16a37e2769 Standardises all files from CRLF to LF 2020-01-12 14:28:01 +00:00
Hatterhat
2006ccf4ef nicc you buffoon you never adjusted the hood type 2020-01-11 00:12:52 -06:00
Lin
c4cb06f8f0 Merge pull request #10112 from Ghommie/Ghommie-cit447
Refactors that mess of a code for alternate worn clothing sprites for digitigrade and taurs.
2020-01-10 01:31:20 +00:00
kevinz000
2944a902c6 Merge pull request #10447 from Arturlang/Bloodsucker_tweaks
[READY] Bloodsucker tweaks
2020-01-08 13:36:24 -08:00
Artur
e16f1d2f21 Makes regen coles not heal instead of affecting aheal 2020-01-08 21:01:37 +01:00
BlackMajor
8085022d97 Couple of changes. Starting on the point bank. 2019-12-31 23:28:30 +13:00
Ghommie
80e716eeaf Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit447 2019-12-30 18:14:47 +01:00
BlackMajor
c14a639f6e crusher wasn't dealing damage whoops 2019-12-30 12:25:12 +13:00
BlackMajor
b811d3e57e More work on it 2019-12-30 01:23:41 +13:00
BlackMajor
375e59a77d Merge branch 'master' into Yeehaw 2019-12-29 22:12:40 +13:00
BlackMajor
2e03a529bf checking off the list 2019-12-29 22:11:10 +13:00
BlackMajor
206a5e168a More mining changes 2019-12-29 20:15:49 +13:00
Hatterhat
940efc0c1c holy shit i hope this compiles 2019-12-26 01:46:04 -06:00
Ghommie
3fcb7808fd args 2019-12-13 02:30:17 +01:00
Ghommie
8ec4bdaef5 Refactors that mess of a code for alternate worn clothing sprites for digitigrade and taurs. 2019-12-13 02:30:11 +01:00
Ghommie
3b8aebbbc2 refactoring altclick interaction to allow parent calls without forcing the turf contents stat menu open. 2019-11-29 00:40:16 +01:00
BlackMajor
c81d1fe7a3 Merge pull request #9867 from Ghommie/Ghommie-cit375
Ports "examine-code refactor"
2019-11-25 11:31:03 +13:00
Knouli
592c952d64 Update regenerative_core.dm 2019-11-19 20:03:04 -05:00
Ghommie
21f15e411d Part 3 2019-11-19 19:34:42 +01:00
Ghommie
dd101ef221 Part 2 2019-11-19 18:00:56 +01:00
Knouli
a6d4e7edef Update regenerative_core.dm 2019-11-19 06:00:56 -05:00
kevinz000
b6af62e994 Update kinetic_crusher.dm 2019-11-05 18:07:46 -07:00
deathride58
30eafc305c Merge pull request #9246 from Linzolle/taur
[READY] some missing icons + sprite changes for taur suits
2019-10-21 21:19:05 -04:00
r4d6
49afd5261c Change SEVA suit & Exo-suit's descriptions 2019-10-19 20:56:35 -04:00
Linzolle
caa61fa0b4 hide your ass 2019-10-05 12:24:10 -05:00
Linzolle
8bc8a0e440 fix shit 2019-09-20 18:25:36 -05:00
skoglol
c1e84774ac one-hand shit 2019-09-20 17:28:44 -05:00
Chayse Ramsay
5055cd73b9 Hardsuit Helmets can now be used as internals masks. Rejoice, CE mains.
Also reworks internals code a little to be much more friendly. Any head or mask item with the flag should now function as an internals mask if it has the ALLOWSINTERNALS flag.
2019-07-28 17:31:59 +01:00
Ghommie
129ca9d71f Ports "Refactors NODROP flag into TRAIT_NODROP" 2019-07-13 10:27:39 +02:00
kevinz000
f458828659 Merge pull request #8503 from Trilbyspaceclone/patch-159
Changing up the drills/picks/jackhammer a bit
2019-06-08 01:10:34 -07:00
Trilbyspaceclone
f6c7eeb4da Update mining_tools.dm 2019-06-05 09:06:47 -04:00
Trilbyspaceclone
d6486e2f6c Update resonator.dm 2019-05-31 23:13:31 -04:00
Trilbyspaceclone
78822d2e42 Update resonator.dm 2019-05-31 23:06:08 -04:00
Trilbyspaceclone
ed95ba20b6 so we dont speed removal plants by missclicks 2019-05-31 23:03:00 -04:00
Trilbyspaceclone
2d91388be8 Update mining_tools.dm 2019-05-31 22:57:28 -04:00
dtfe3
0085a69d31 Watcher Wing Trophy Effect increase 2019-05-21 18:12:42 +02:00
Poojawa
9374e83e7d fixes armor plate oversight 2019-05-01 00:05:14 -05:00
Poojawa
fb234783a7 muzzle-compatible helmets and masks 2019-04-12 04:00:47 -05:00
Trilbyspaceclone
33213b0099 Update kinetic_crusher.dm 2019-03-05 01:06:16 -05:00
deathride58
19addaefec Merge pull request #7669 from nik707/suitupgrade
Exosuit sprites have arrived. "Now with more gasmask."
2018-10-22 22:37:02 -04:00
Poojawa
e6fc75d1ae Adds some missing suits, digi and taur EXO 2018-10-21 00:56:16 -05:00
nik707
04bacde07d adds the gasmasks lol im fucking dumb 2018-10-21 00:20:31 -05: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