Commit Graph

1582 Commits

Author SHA1 Message Date
Dan-Neposh
9b3ed3009f updates the credits bit of clockwork cult 2020-07-31 00:14:23 -04:00
DeltaFire
abe2f83869 Fixes the clockcult gamemode
Servants no longer spawn / stay on the start screen and have no role (haha OOPS). Things SHOULD work now, at least on local with debug mode on, I give no guarantees.
2020-07-31 05:30:21 +02:00
silicons
e4148fe4ad Merge remote-tracking branch 'citadel/master' into 12742 2020-07-29 01:11:11 -07:00
Lin
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
silicons
6f9c310ea8 Merge pull request #12920 from zeroisthebiggay/blackboxfatcox
Ports the Black Box theft objective from TG
2020-07-26 22:58:43 -07:00
zerothebigboy
27bf41ac5f a 2020-07-26 06:29:10 -04:00
zerothebigboy
40d12fd02f a 2020-07-26 06:20:06 -04:00
silicons
ffd44b78ba Merge remote-tracking branch 'citadel/master' into clickcd_experimental 2020-07-23 10:26:03 -07:00
silicons
6d4f5c633b Update clown_ops.dm 2020-07-21 22:13:58 -07:00
silicons
f3efa19436 Merge remote-tracking branch 'citadel/master' into 12742 2020-07-21 11:25:26 -07:00
Lin
7adae61ade Merge pull request #12773 from Citadel-Station-13/silicons-patch-28
jexp exemption now also exempts from antag days remaining locks
2020-07-20 18:22:42 -05:00
Lin
67a6330e77 Merge pull request #12786 from silicons/survivalists
makes survivalists pseudoantags again and limits summon guns/magic to one use
2020-07-20 18:20:08 -05:00
silicons
98d3ac80d9 :pika: 2020-07-20 11:25:17 -07:00
silicons
993b4ec222 Merge remote-tracking branch 'citadel/master' into unarmed_parry 2020-07-16 19:39:46 -07:00
Keate Senior
287df312e1 Reebe should probably initialize with the mode again, huh. 2020-07-16 02:31:38 -04:00
silicons
f653fd5c3c kay 2020-07-15 14:58:51 -07:00
Keate Senior
e9ca36b902 ahaha nice I deleted the line that gives them the slab 2020-07-15 00:08:37 -04:00
silicons
a381ed324d Update game_mode.dm 2020-07-14 09:28:50 -07:00
Artur
5f9364c5f8 Merge remote-tracking branch 'Upstream/master' into TGUI-3.0 2020-07-13 16:20:54 +03:00
Keate Senior
80b4c03c82 Initial changes to get this to github for public reviewing
-Removes the Reebe z level and puts it on the cc z level
-Replaces the Neovgre mech stepsound
-Moves spacial gateway into drivers so the cult isn't stuck stationside
-Adds the Belligerant scripture, which applies the Belligerant status effect to non-clankers in range
-Various other changes currently commented out for later work on them.
-removes the abductor teleport cameras from Reebe
-adds a Brass multitool, essentially just an advanced multitool with a special sprite.
-makes clockcult armor have 0 laser defense normally and 10 defense when the ark is almost done summoning Ratvar instead of -25 --> -15
-Makes spear recalling worded to support the addition of new weapons to summon
-Adds new structures for power generation and shuttle delaying
-Other changes I've probably forgotton, but are too lazy to scrounge through the code at 12:43 AM
2020-07-12 00:43:54 -04:00
Putnam
a625d6562b Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into putnamos-for-real 2020-07-08 22:02:03 -07: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
Artur
280d3de6c3 Merge remote-tracking branch 'origin/master' into TGUI-3.0 2020-07-07 18:37:45 +03:00
DeltaFire
eeadc9a0e7 fixes the kill once objective
the target being afk / disconnecting is now only accepted at roundend, and doesn't lead to it being regarded as permanently completed midround.
2020-07-06 23:00:36 +02:00
Artur
6ee1eba56c Merge remote-tracking branch 'origin/master' into TGUI-3.0 2020-07-02 23:23:47 +03:00
Artur
20245f7319 Merge remote-tracking branch 'origin/master' into TGUI-3.0 2020-06-30 02:30:29 +03:00
zerothebigboy
40c515b383 i hope this works 2020-06-29 19:13:26 -04:00
Putnam3145
ee2fedd4af Merge pull request #12390 from Ghommie/Ghommie-cit800
Porting brain trauma updates: Curse of madness, cloning traumas, random brain trauma event.
2020-06-29 12:44:33 -07:00
timothyteakettle
b94267e1e1 more spellchecks 2020-06-27 02:41:50 +01:00
Ghommie
ae053a9a08 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit800 2020-06-23 03:12:49 +02:00
Artur
c41d2e78be Conflicts!!! 2020-06-22 17:39:24 +03:00
Artur
ceba739231 Cooonflicts 2020-06-16 01:23:42 +03:00
Timothy Teakettle
7fbfb4ad0e Merge remote-tracking branch 'upstream/master' into embed-changes 2020-06-15 22:48:26 +01:00
Timothy Teakettle
34c9a2f821 part 4 2020-06-11 21:45:32 +01:00
Timothy Teakettle
38bf529f3c a tonne of fixes 2020-06-11 20:18:36 +01:00
Artur
b6dc41b852 Merge remote-tracking branch 'origin/master' into TGUI-3.0 2020-06-09 11:07:39 +03:00
kevinz000
1a9787a9c2 Merge remote-tracking branch 'citadel/master' into combat_rework 2020-06-02 21:49:43 -07:00
Ghom
a41f40503d More lenient soft stamina combat, decentralized gun inaccuracy from combat mode. (#12347)
* A more lenient soft stamina crit.

* Yea, your shots are gonna go straight toh.

* accuracy whacks (leaves the bow as is for now).

* Fixing stam penalties calculations, spread the range.

* aaaaaah

* 1.4 seconds delay vs 1.2

* Thanks, linter.

* Missed one.
2020-06-02 15:22:06 -07:00
Trilbyspaceclone
916a1ab349 Update objective_items.dm (#12420) 2020-06-02 23:37:05 +02:00
Artur
19f215477e Merge remote-tracking branch 'upstream/master' into TGUI-3.0 2020-05-30 18:52:02 +03:00
kevinz000
05fe0c7dcc ok 2020-05-30 00:59:29 -07:00
Chayse Ramsay
f95222fee0 For the stranger there among them had a big iron on his hip. Big iron on his hiiiiiiip. (#12155)
* HoS modular revolver, ported from vore

* Bugfixing, sanity checks etc.

* Update hos.dm

* Sprite fixed

* Automatic changelog compile [ci skip]

* HoS Weapon Selection

* Icons

* Clamp fix, removing rogue items from ye olde list

* Update ammo.dmi

* Requested Changes Part 1

* Beacon fixed (kind of)

* Subtypes fix

* User

* Giving process_chamber a user so that the proc can use to_chat without requiring loc, fixes switching so the gun only switches to the same type when empty

* redundant item

* Adds an examine notice on how to remove the magazine

* Requested Changes

* Icons

Co-authored-by: Changelogs <action@github.com>
2020-05-30 03:17:56 +02:00
Ghommie
e51ac4e745 Porting brain trauma updates: Curse of madness, cloning traumas, random brain trauma event. 2020-05-29 17:58:35 +02:00
Rohesie
d88c815845 vars (#12373) 2020-05-28 01:18:26 +02:00
Artur
9d04b0835b Conflicts galore 2020-05-21 21:08:12 +03:00
Artur
a16f2df71c Cleans up after oracleUI
Disablers paper for now until markdown paper is done
2020-05-19 20:34:45 +03:00
Ghom
335f5a37b9 Plane adjustments on several low layer objects. (#12286) 2020-05-17 17:02:57 -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
Putnam
e8d7da56f4 Ported C++mos from yogs (help me) 2020-05-11 15:44:26 -07:00