shikix/GS13NG
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
34,303 Commits 5 Branches 0 Tags
b3afed69f44f6b8564951ebeef06f7acf8beefaf
Commit Graph

305 Commits

Author SHA1 Message Date
Ghom
16dea7ceed Revamped the paper wizard robes. (#12348) 
* Better paper wizard robes.

* return value.

* ooo

* Aaa

* aaaa
 2020-05-27 18:01:22 -07:00
Lin
4ee5d0cb37 Merge pull request #12296 from kevinz000/paracoat 
Adds a paramedic wintercoat
 2020-05-21 19:26:31 +00:00
Ghom
4c3dac467f Mining inquisitor/berserker hardsuit nerf, slight drake armor buff. (#12289) 
* Mining inquisitor/berserker hardsuit nerf, slight drake armor buff.

* Pretty unlikely you'll be hit by more than a handful spells in a single round.

* aaaa

* Update miscellaneous.dm
 2020-05-18 16:55:40 -07:00
kevinz000
810da1b7c8 changes 2020-05-18 04:41:10 -07:00
Ghom
12ac08d7c5 Porting tesla/electrocute code updates. (#12280) 
* Porting tesla/electrocute code updates.

* Why is the dominator being insta-deleted by zaps a good idea?

* Yikes.

* ah
 2020-05-17 16:35:17 -07:00
Trilbyspaceclone
af0d1da409 Nerfs Drake Armor (#12133) 
* Update cloaks.dm

* Update cloaks.dm

* Update cloaks.dm

* Update cloaks.dm

* Update cloaks.dm

* Update cloaks.dm
 2020-05-15 03:40:13 +02:00
Ghommie
7fb96ab0cf Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit685 2020-05-12 20:06:59 +02:00
kappa-sama
e24bda9a9f this (#12122) 2020-05-07 01:08:48 +02:00
Ghommie
b383066e57 Replacing the MATERIAL_NO_EFFECTS flag with MATERIAL_EFFECTS. 2020-05-02 00:00:49 +02:00
Ghommie
94f014589d Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit685 2020-04-25 17:09:34 +02:00
Lin
7f271157c3 Merge pull request #11929 from Ghommie/Ghommie-cit692 
Shielded Component
 2020-04-22 20:33:12 +00:00
Ghommie
824904844c Componentized for sanity. 2020-04-21 19:51:44 +02:00
Ghommie
c93f028a97 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit685 2020-04-21 01:53:41 +02:00
Ghommie
9c8f6cd00f peeves. 2020-04-19 02:03:05 +02:00
Ghommie
e3fb978465 Shielded element. 2020-04-19 01:48:51 +02:00
Ghommie
87a6bd013c Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit685 2020-04-17 21:57:21 +02:00
Ghom
be0409a94a Update toggles.dm 2020-04-17 19:58:57 +02:00
Ghommie
7581d1d5cf Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit686 2020-04-17 18:37:25 +02:00
Ghommie
c5c75c0870 Fixing some more mistakes I did to clothing. 2020-04-17 18:32:11 +02:00
Ghommie
4c6f1b622b Porting Goofconomy & co. 2020-04-17 07:48:11 +02:00
Ghommie
fe43581d31 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit667 2020-04-16 15:09:52 +02:00
Ghommie
616d482cf6 Deleting poly clothes copypasta. 2020-04-13 22:51:46 +02:00
Ghommie
05a954f000 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit611 2020-04-13 02:01:01 +02:00
Ghommie
7c1e5aa2c9 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit655 2020-04-09 15:46:19 +02:00
Ghommie
d2b624a908 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit667 2020-04-09 14:59:40 +02:00
Lin
8379169b81 Merge pull request #11476 from kevinz000/shield_refactor 
Completely overhauls how blocking, shields, reflecting, and anything in between is handled. Has some small gameplay effects.
 2020-04-07 20:47:15 +00:00
kevinz000
413ded02c0 Merge pull request #11433 from Ghommie/Ghommie-cit616 
Spellcasting element
 2020-04-03 16:31:10 -07:00
Ghommie
56669f9296 Minor snowflakes clothing variations refactor. Removal of copypasted states. 2020-04-04 00:22:18 +02:00
Ghommie
c3faf94d8f WIP 2020-03-30 05:29:39 +02:00
kevinz000
bf0970d8c3 Merge remote-tracking branch 'citadel/master' into shield_refactor 2020-03-23 15:34:04 -07:00
zeroisthebiggay
f5a96241ab sneaksuits are not fireproof (#11573) 
* and i wanna die

* i decide to revert

* a a a a
 2020-03-23 15:47:41 +01:00
Ghommie
2045fb86f6 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit616 2020-03-21 21:41:34 +01:00
kevinz000
300c8e3c6d Merge remote-tracking branch 'citadel/master' into shield_refactor 2020-03-21 09:53:39 -07:00
ZeroMan
35a4d71a54 im sorry little one 2020-03-19 21:59:14 -04:00
kevinz000
7fdbcc55c6 s 2020-03-16 11:12:10 -07:00
kevinz000
e3301f8722 bet 2020-03-16 10:44:02 -07:00
kevinz000
6af9c54da5 better 2020-03-16 04:59:55 -07:00
kevinz000
a77be038b8 refactoring this whole thing again 2020-03-16 04:56:32 -07:00
kevinz000
2a9e4bebdd priority 2020-03-16 04:24:18 -07:00
kevinz000
69374c64c9 k 2020-03-16 04:18:22 -07:00
kevinz000
857f793600 ok 2020-03-16 04:12:54 -07:00
kevinz000
644273beca k 2020-03-16 04:09:25 -07:00
Ghommie
312ef1d961 Merge branch 'Ghommie-cit616' of https://github.com/Ghommie/Citadel-Station-13 into Ghommie-cit616 2020-03-15 22:38:42 +01:00
Ghommie
ea30b2fb1a Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit616 2020-03-15 22:35:59 +01:00
Ghom
bba13d706d FAAAAKE 2020-03-12 00:16:42 +01:00
Ghommie
d31075eb54 Spellcasting element 2020-03-11 16:23:30 +01:00
Ghommie
27a7f754c4 Fix runtimes some more. 2020-03-10 22:40:06 +01:00
Ghommie
2b4b626fac support for items that switch states through update_icon. 2020-03-10 16:55:30 +01:00
kevinz000
16d6ba9e21 Merge pull request #11323 from Ghommie/Ghommie-cit600 
Porting a couple material datums code updates and fixes.
 2020-03-06 00:17:21 -07:00
Ghommie
f2c8a7cd6f Porting a couple material datums code updates and fixes. 2020-03-04 15:59:46 +01:00