Commit Graph
771 Commits
Author SHA1 Message Date
kappa-samaandGitHub 94ee8bec08 ok 2020-08-01 19:19:59 -04:00
kappa-samaandGitHub adf4a8a2e3 indent 2020-07-31 17:10:06 -04:00
kappa-samaandGitHub cc34c4b1a2 no empty slot 😔 2020-07-31 17:09:54 -04:00
Letter N b376a6b6c4 Merge remote-tracking branch 'origin/master' into TGUI-4 2020-07-30 14:43:52 +08:00
Letter N 0805265412 yet another batch. MAJOR: APC 2020-07-30 12:54:53 +08: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
LinandGitHub 81a7542aa6 Merge pull request #12834 from silicons/clickcd_experimental
Experimental hybrid clickdelay system (No seriously I'm trying my best to not call it Minecraft attack delays)
2020-07-28 21:51:10 -05:00
kappa-samaandGitHub 72cb4fb920 honk 2020-07-28 21:56:39 -04:00
silicons 5bf4afcade sigh 2020-07-27 14:09:37 -07:00
Enric Gabriel c23b75ea39 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 2020-07-26 20:18:40 -03:00
crazyraio2 c488257c4f amulet was getting invisible 2020-07-26 15:47:39 -03:00
d312fbc4db Mining update (#30)
* smol mining update

* Revert "smol mining update"

This reverts commit 9a0bd466ff.

* the .wav files i will use

* the rest that is being added for now

* fixes your stuff

* makes the crusher purchasable

* fixes legion's trophy

* so many icons and oggs

* SIF and more icons

* even more icons, sorry

* new modkits, yay

* oh come on, it didn't update

* some bosses seen to be ready

* Glory Kill system, should work just fine

* even more icons, jeez, also, elite mods

* oh hey, i got the icon

* almost done

* icons and meme dragon

* it's icon was hidden and i didn't notice

* why do i hear boss music ?

* one day...

* while Nano was...

* not continuing that

* stole some compatibility stuff

* the end is near

* some stuff to make stuff work

* probably one of the last commits

* king goat itself

* THE ERRORS, THEY'RE EVERYWHERE

* so close...

* the new ruins should spawn now

* should be the last commit, let's test it

* Now The Gladiator actually exists

* make them mad, and toggle their music

* oh, wait, need to give you the new files

* i think i saved someone's ears

* missing areas, i'm sorry

* good luck fighting KG without a ladder

* just leave a comment, nothing else

* fixes double spawn at least for hiero, aka why the fuck make two of the same proc and not remove 1st

* invisible hat, not anymore

* takes some stuff before bob even merges it on theirs

* how did these icons disappear ?

* fixes some oopsies

* sand plz help

* *fixes your thing*

* and i think i fixed the other

* fixes

* no async needed

* im done, just merge this useless thing

Co-authored-by: crazyraio2 <44246096+crazyraio2@users.noreply.github.com>
2020-07-25 20:04:07 -03:00
Hatterhat 14fba6a056 funny parry sticks 2020-07-24 21:19:01 -05:00
Timothy Teakettle 7fb55a02a5 section one 2020-07-24 22:34:22 +01:00
silicons ffd44b78ba Merge remote-tracking branch 'citadel/master' into clickcd_experimental 2020-07-23 10:26:03 -07:00
siliconsandGitHub 9222933d77 Merge pull request #12816 from timothyteakettle/wound-port
ports part 1 of tg wounds
2020-07-23 10:25:25 -07:00
silicons 703afec454 ok 2020-07-23 08:57:15 -07:00
siliconsandGitHub 60a25981bc Merge pull request #12835 from kappa-sama/patch-36
might fix necropolis chests turning up completely empty
2020-07-22 02:31:21 -07:00
silicons 2f11fb6a8b ok 2020-07-21 11:59:39 -07:00
silicons 184e3992f3 fixes 2020-07-21 11:56:23 -07:00
kappa-samaandGitHub c92abfe2ce bruh 2020-07-20 21:18:39 -04:00
Timothy TeakettleandGitHub 75a2035774 Merge branch 'master' into wound-port 2020-07-21 01:10:51 +01:00
siliconsandGitHub 267186a5d3 Merge pull request #12646 from Chiirno/emi
[READY] Alt-click cigarette pack functionality added to pill bottles.
2020-07-20 16:15:38 -07:00
silicons 692656b02d Whew 2020-07-20 11:53:33 -07:00
kappa-samaandGitHub 3676b03f28 experiment 2020-07-20 14:53:22 -04:00
silicons 98d3ac80d9 :pika: 2020-07-20 11:25:17 -07:00
Timothy TeakettleandGitHub 1a5008fee7 Merge branch 'master' into wound-port 2020-07-18 23:06:49 +01:00
LinandGitHub ba3dc6a73b Merge pull request #12679 from silicons/unarmed_parry
Ok ok hear me out: Implements unarmed parry.
2020-07-18 17:02:02 -05:00
Timothy TeakettleandGitHub 974b80a2fd Merge branch 'master' into wound-port 2020-07-18 21:45:24 +01:00
siliconsandGitHub 93d669d205 Merge pull request #12759 from YakumoChen/hierophant-hugbox
set hierophant friendly fire check to on by default
2020-07-17 17:09:17 -07:00
Timothy Teakettle 93b4570f8d more changes 2020-07-17 23:23:47 +01:00
Timothy Teakettle a4478b0cda it continues 2020-07-17 22:38:28 +01:00
silicons 993b4ec222 Merge remote-tracking branch 'citadel/master' into unarmed_parry 2020-07-16 19:39:46 -07:00
siliconsandGitHub e03948dcba Merge pull request #12229 from Arturlang/TGUI-3.0
[READY]TGUI 3.0
2020-07-16 17:28:42 -07:00
Artur af65b626e3 Merge remote-tracking branch 'Upstream/master' into TGUI-3.0 2020-07-16 15:56:08 +03:00
Letter N 819ca63456 https://github.com/tgstation/tgstation/pull/51679 - pickup_item missing 2020-07-16 20:42:02 +08:00
Letter N 9575c52b13 https://github.com/tgstation/tgstation/pull/52059 - the forgotten part 2020-07-16 20:21:39 +08:00
siliconsandGitHub 6121cbd091 Merge pull request #12738 from timothyteakettle/travelling-traders
the travelling trader midround event
2020-07-15 08:50:20 -07:00
Artur f5ee74803f Updates minter to tg and the prereqs 2020-07-14 18:08:12 +03:00
Timothy Teakettle 8de062adbb fix 2020-07-13 19:46:51 +01:00
YakumoChenandGitHub 072b4b673f set hierophant friendly fire to on by default 2020-07-13 09:40:58 +00:00
Timothy Teakettle c1592ad162 more rewards 2020-07-11 23:27:29 +01:00
silicons 6cbab55ef8 Merge remote-tracking branch 'citadel/master' into unarmed_parry 2020-07-07 21:07:58 -07:00
silicons 6ee63f66aa whew 2020-07-07 20:48:54 -07:00
TrilbyspacecloneandGitHub b2dd2a1053 Update necropolis_chests.dm 2020-07-07 14:28:40 -04:00
Artur 280d3de6c3 Merge remote-tracking branch 'origin/master' into TGUI-3.0 2020-07-07 18:37:45 +03:00
Cirno c2ba973c88 Merge remote-tracking branch 'origin' into emi 2020-07-04 15:59:47 -03:00
Cirno 020da9fa07 i hope this works 2020-07-04 15:47:38 -03:00
Ghommie f5ffd7d2a9 Easing fine tuning of the system. 2020-07-03 03:00:33 +02:00