Commit Graph

6573 Commits

Author SHA1 Message Date
Timothy Teakettle
35d01aa0f4 Merge pull request #15918 from LeDrascol/port-heirloom-update
[PORT] Non-global heirloom definitions
2023-01-12 23:39:41 +00:00
Jerry Wester
ae347f3399 Revert "MODsuits" 2023-01-08 17:30:26 -07:00
silicons
23327fa268 Merge pull request #15894 from JerryWester/modsuits
MODsuits
2023-01-07 14:07:28 -08:00
Darius
3adcab1756 Display job slots out of total during late-join
Changes late join text from "Job (current)" to "Job (current/limit)" to prevent confusion. Infinite-slot jobs display an infinity symbol.
2023-01-04 19:15:09 -05:00
Darius
d90fa375e1 Move heirloom lists to relevant files
Port of the current TG heirloom system.

Heirlooms are now stored in job_types and species_types instead of a global list. Items used as heirlooms match their modern TG counterparts when possible.

Also fixes the ancient first aid kit, which is used for a heirloom.
2023-01-04 13:57:54 -05:00
SandPoot
5ee1e5414f Merge pull request #15895 from Linzolle/claw
fixes species not using the claw animation for unarmed attacks
2022-12-24 18:42:09 -03:00
Jerry Wester
b52e7a5657 ion jetpack module 2022-12-14 23:36:47 -07:00
Lin
7d0c3df2ad Merge pull request #15755 from timothyteakettle/dullahan-2-electric-boogaloo
dullahans 2: electric boogaloo
2022-12-14 19:07:59 -07:00
Jerry Wester
32a5d02434 Merge branch 'master' into modsuits 2022-12-13 19:18:24 -07:00
Lin
2eee8e4339 Merge pull request #15888 from DeltaFire15/revenge-of-the-blacklist
Roundstart species with a quirk blacklist balance points
2022-12-12 19:13:32 -07:00
Lin
7205781c47 Merge pull request #15892 from SandPoot/let's-sing-the-reference-clearing-song
Solves some harddels
2022-12-12 19:11:49 -07:00
Lin
a0cbb52479 slash -> claw 2022-12-12 19:10:50 -07:00
Jerry Wester
a4631070a8 revert some changes 2022-12-11 20:32:42 -07:00
Jerry Wester
99ad8cc1a5 pai panel, force deactivation, and rad protection 2022-12-11 20:32:39 -07:00
Jerry Wester
f7ac3c7624 beeg commit 2022-12-11 20:32:35 -07:00
PeriodicChaos
b538ad721b modsuits part 2 2022-12-11 20:30:58 -07:00
SandPoot
8911fe5e0b clear em 2022-12-11 17:58:45 -03:00
DeltaFire
4beb8ce636 roundstart species balance points 2022-12-03 20:35:23 +01:00
silicons
268184347a Merge pull request #15875 from JerryWester/revert-15869-feat/drider-webs
Revert "Grant Arachnid Abilities to Driders"
2022-11-03 22:52:38 -07:00
deathride58
4900a28c00 Merge pull request #15862 from Citadel-Station-13/stuff
adds multiline /me emotes
2022-10-26 16:49:31 -04:00
Lin
03c62f4359 Merge pull request #15876 from SandPoot/fix-deadchat_broadcast
Fixes deadchat_broadcast
2022-10-25 04:36:00 +00:00
SandPoot
24ee6077c7 push changes 2022-10-23 00:18:03 -03:00
Jerry Wester
aace737989 Revert "Grant Arachnid Abilities to Driders" 2022-10-19 17:20:52 -06:00
silicons
afed04d2fa Merge pull request #15873 from zeroisthebiggay/tallears
tall ears from virgo
2022-10-19 16:15:11 -07:00
zerothebigboy
1f8f5dc071 cocka 2022-10-19 03:49:33 -04:00
silicons
2ec0e810fc Merge pull request #15869 from JerryWester/feat/drider-webs
Grant Arachnid Abilities to Driders
2022-10-18 21:17:03 -07:00
zerothebigboy
2fd981a05a penis 2022-10-18 23:57:02 -04:00
zerothebigboy
30bf2312f3 seizure 2022-10-18 23:37:40 -04:00
silicons
f7937e54e0 Merge pull request #15860 from shellspeed1/public-bounties
Port of public bounties and the sales tagger from tg.
2022-10-12 03:27:37 -07:00
shellspeed1
5fc34292c0 fixes resting 2022-10-09 15:45:51 -07:00
Jerry Wester
1015987d12 driderman, driderman, does whatever a spider can 2022-10-06 23:38:16 -06:00
VM_USER
2b2aa28207 this is better 2022-09-25 20:00:36 -07:00
silicons
c6d908f578 Update say.dm 2022-09-23 16:27:24 -07:00
silicons
a8ef986ce5 Merge pull request #15848 from shellspeed1/full-auto-port-from-tg-Credit-to-Fikou
Port of a bunch of stuff to update guns at this point because we have a bunch of stuff we are missing.
2022-09-23 16:27:03 -07:00
silicons
b0703d1bd9 Merge pull request #15854 from shellspeed1/borg-radio-improvements
Ports Adding radio access to borgs by default from splurt. Credit to NopemanMcHalt for the splurt port and Ayfa212 for the initial work.
2022-09-23 16:26:54 -07:00
silicons
a1fc1e0377 Merge pull request #15855 from shellspeed1/borg-pda-addition
Ports borg pdas from hyper. Credit to haha26315 for the orginal PR and BongaTheProto for their port to splurt.
2022-09-23 16:16:03 -07:00
shellspeed1
a55b2c4ff3 ports https://github.com/tgstation/tgstation/pull/56375. Credit to cacogen. 2022-09-20 20:05:59 -07:00
shellspeed1
a3c01b96f3 Update xeno.dm (#15837) 2022-09-17 13:37:55 -07:00
shellspeed1
11ec2b89e0 borg pda 2022-09-17 02:40:37 -07:00
shellspeed1
8d9804e953 adds radio access to borgs by default 2022-09-17 02:20:36 -07:00
Timothy Teakettle
3de3dc8e6f lets ghosts click a pAI device to download into it without a master (#15838)
* yes

* Update pai.dm
2022-09-13 12:41:36 -07:00
shellspeed1
f2ed6a571c this gets it to the point it compiles 2022-09-09 18:04:52 -07:00
shellspeed1
fbc80cf829 initial port 2022-09-09 00:29:20 -07:00
zerothebigboy
434d7e0d10 don't lick a pai worst mistake i have ever made please fuck do not do it 2022-08-27 06:29:16 -04:00
silicons
f2b8061d4b Update observer.dm (#15802) 2022-08-21 20:39:17 -07:00
Putnam3145
12233bfbca Fix infinite blood trails 2022-08-18 23:36:24 -07:00
timothyteakettle
2313a24918 Merge branch 'master' into dullahan-2-electric-boogaloo 2022-08-11 14:43:48 +01:00
Putnam3145
b2d816b825 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into station_traits 2022-08-07 17:59:28 -07:00
Timothy Teakettle
671e5dd872 oh shit oh fuck 2022-08-07 23:53:08 +01:00
Timothy Teakettle
7df374a1f5 IPC PLEASE 2022-08-07 23:51:02 +01:00