Commit Graph

277 Commits

Author SHA1 Message Date
zerothebigboy
9baedbd904 a 2020-08-10 10:08:25 -04:00
zerothebigboy
cf75f7d4b6 a 2020-08-10 10:08:15 -04:00
Timothy Teakettle
9721025582 Merge branch 'master' into wounds-part-2 2020-07-29 15:47:44 +01:00
Timothy Teakettle
36d6246bc1 it is now harder to deal wounds 2020-07-26 18:54:57 +01:00
Timothy Teakettle
75c40f6d93 what if wound values didnt suck 2020-07-26 18:51:19 +01:00
silicons
ffd44b78ba Merge remote-tracking branch 'citadel/master' into clickcd_experimental 2020-07-23 10:26:03 -07:00
silicons
286e5384d1 fix 2020-07-21 12:07:24 -07:00
silicons
2f11fb6a8b ok 2020-07-21 11:59:39 -07:00
silicons
416b989e12 changes 2020-07-20 11:35:10 -07:00
timothyteakettle
74b2764591 sprites and some missed things 2020-07-18 03:08:03 +01:00
kevinz000
445d94f335 haha whew 2020-06-17 21:32:10 -07:00
Timothy Teakettle
d7bce8aec0 ports some events 2020-06-15 20:22:40 +01:00
Ghom
37294fd4b7 Fixing wrong helmet type for old beserker hardsuit (#12503) 2020-06-12 17:07:59 -07:00
Ghom
c877358340 Removes the immutable bit from the mining inquisitor/berserk hardsuits' slowdown. 2020-05-26 15:27:34 +02: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
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
Ghom
7c7147cb3e Field of Vision component. (#12075)
* Hopeless WIP for vision cones.

* Core component and hooks done

* Removing clutter.

* linter bashing me for using statements as args.

* Ok.

* continue

* bring back the macro

* Configs and openspace filter.

* Chat plane, reset perspective signal, mechs/vehicles cases, machineries.

* view, viewers and spoopy ghosts.

* Renamed component, admin fun button and snowflakes robots.

* Whoopsie.

* Yikes

* test merge tweak.

* radial yaketi sax.

* Fixed tgui UIs, some messages not displayed to the target.

* Documentation and a little bugfix.

* Pulling QoL, seventh plane made in this PR.

* Fix.

* Tweaks and improvements.

* Update randomverbs.dm
2020-05-15 15:25:04 -07:00
Trilbyspaceclone
899c5a4575 Corrects evey storge with storage (#12220)
* Update medical.dm

* Update autobottler.dm

* Update autobotter_designs.dm

* Update medical_designs.dm

* Update hardsuit.dm

* Update code/modules/cargo/bounties/medical.dm

Co-authored-by: Ghom <42542238+Ghommie@users.noreply.github.com>
2020-05-13 21:21:11 +02:00
Ghommie
90bf157f5e Fixing some runtimes and issues. 2020-05-08 17:17:33 +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
Trilbyspaceclone
047bb6c162 Update hardsuit.dm 2020-04-20 16:19:30 -04:00
Ghommie
e3fb978465 Shielded element. 2020-04-19 01:48:51 +02:00
Lin
79f41bc654 Merge pull request #11841 from Citadel-Station-13/Ghommie-patch-4
Hardsuit helmet peeve.
2020-04-14 18:37:31 +00:00
Ghommie
db43f53ac4 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit611 2020-04-13 16:15:40 +02:00
Ghom
5765ceb316 Update hardsuit.dm 2020-04-13 15:02:01 +02:00
Ghom
873e67f79c Update hardsuit.dm 2020-04-13 14:57:47 +02:00
kevinz000
105d405d2d Merge pull request #11837 from Ghommie/Ghommie-cit678
Item color removal port fixes.
2020-04-12 22:34:45 -07:00
Ghommie
0d0f14d3f8 Item color removal port fixes. 2020-04-13 03:34:58 +02:00
kevinz000
6b6683846b Merge pull request #11819 from Ghommie/Ghommie-cit672
Minor action datum refactor and spellcasting fix.
2020-04-12 17:02:36 -07: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
31e0321808 Minor action datum refactor and spellcasting fix. 2020-04-11 16:53:08 +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
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
c3faf94d8f WIP 2020-03-30 05:29:39 +02:00
Ghommie
54cdae148d Removes uncompiled flightsuit code leftovers and bad hooks. 2020-03-24 20:28:13 +01:00
kevinz000
7a25e04324 bet 2020-03-16 11:15:11 -07:00
kevinz000
d3724d5fbd f 2020-03-16 10:59:34 -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
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
Putnam3145
480eb32c68 Merge pull request #11418 from Ghommie/Ghommie-cit615
Fix runtimes some more.
2020-03-11 17:01:13 -07: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
e210f7d535 Merge pull request #11391 from Ghommie/Ghommie-cit612
Porting "Further update_icon splitup"
2020-03-10 05:58:17 -07:00
kevinz000
d3306e2eec Merge pull request #11392 from zeroisthebiggay/hardsuithelmetsarenice
syndicate elite hardsuit helmet doesnt hide masks anymore
2020-03-10 05:57:27 -07:00
kevinz000
bfb75eb26b Merge pull request #11396 from Ghommie/Ghommie-cit613
Ports "Switches out the three billion args of electrocute act for flags"
2020-03-10 05:56:28 -07:00