cyberpresidentvanellope/Sandstorm-Station-13
1
0
Fork 0
mirror of https://github.com/Sandstorm-Station/Sandstorm-Station-13.git synced 2026-08-20 19:57:56 +01:00
Code Issues Packages Projects Releases Wiki Activity
38,600 Commits 8 Branches 0 Tags
machine-changes
Commit Graph
287 Commits
Author SHA1 Message Date
Enric Gabriel 242400a5d6 push the files 2020-09-07 20:40:03 -03:00
Enric Gabriel 8558cc8747 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into master 2020-08-04 01:48:59 -03:00
Timothy TeakettleandGitHub 9721025582 Merge branch 'master' into wounds-part-2 2020-07-29 15:47:44 +01:00
Enric Gabriel 935901593b Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into master 2020-07-29 09:52:32 -03: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
Enric Gabriel e0fdf3dce9 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 / merge conflicts 2020-07-23 19:14:58 -03: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
Enric Gabriel 776b763e17 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 2020-06-22 07:03:48 -03:00
kevinz000 445d94f335 haha whew 2020-06-17 21:32:10 -07:00
Enric Gabriel d6e4eb9de3 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 2020-06-18 00:28:18 -03:00
Timothy Teakettle d7bce8aec0 ports some events 2020-06-15 20:22:40 +01:00
Enric Gabriel 6f735e0d40 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 2020-06-12 21:27:31 -03:00
GhomandGitHub 37294fd4b7 Fixing wrong helmet type for old beserker hardsuit (#12503) 2020-06-12 17:07:59 -07:00
Enric Gabriel 6c2c5b8a3c Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 2020-05-26 21:46:40 -03:00
GhomandGitHub c877358340 Removes the immutable bit from the mining inquisitor/berserk hardsuits' slowdown. 2020-05-26 15:27:34 +02:00
Enric Gabriel 764fb8ac2a Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 2020-05-19 17:19:26 -03:00
GhomandGitHub 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
Enric Gabriel 4d66452c27 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 2020-05-18 13:20:31 -03:00
GhomandGitHub 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
Enric Gabriel e8996d43f1 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 2020-05-15 20:05:39 -03:00
GhomandGitHub 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
Enric GabrielandGitHub e76a4b5e3a ce hardsuit buff and give tweak (#6) 2020-05-14 23:19:59 -03:00
TrilbyspacecloneGitHubGhom
 		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
LinandGitHub 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
TrilbyspacecloneandGitHub 047bb6c162 Update hardsuit.dm 2020-04-20 16:19:30 -04:00
Ghommie e3fb978465 Shielded element. 2020-04-19 01:48:51 +02:00
LinandGitHub 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
GhomandGitHub 5765ceb316 Update hardsuit.dm 2020-04-13 15:02:01 +02:00
GhomandGitHub 873e67f79c Update hardsuit.dm 2020-04-13 14:57:47 +02:00
kevinz000andGitHub 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
kevinz000andGitHub 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
LinandGitHub 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
kevinz000andGitHub 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