Darius
d6ddb68c6f
Minor updates to High Luminosity Eyes flavor text
...
This commit does the following:
- Fixes minor typos
- Increases the amount of information presented
- Adjusts flavor text to be more specific
2023-01-11 13:39:00 -05:00
Timothy Teakettle
c8fc27fc9c
Merge pull request #15930 from SandPoot/reskinning
...
Update to reskinning
2023-01-11 01:00:35 +00:00
SandPoot
3b8d102fac
puts pda in the system to remove shitcode
2023-01-10 20:02:12 -03:00
SandPoot
cf51a4dce9
dusting off
2023-01-10 18:32:49 -03:00
SandPoot
6bbd44afe7
element time
2023-01-10 18:08:17 -03:00
Jerry Wester
ae347f3399
Revert "MODsuits"
2023-01-08 17:30:26 -07:00
silicons
35497b250f
Merge pull request #15914 from Hatterhat/conveyor-sorter
...
[good to go] conveyor sorters, conveyor switch tool interacts, also makes mechs not explode on sale
2023-01-07 14:09:55 -08:00
silicons
23327fa268
Merge pull request #15894 from JerryWester/modsuits
...
MODsuits
2023-01-07 14:07:28 -08:00
SandPoot
183eaf8a68
come on, the signal positions!
2023-01-07 16:34:23 -03:00
SandPoot
c3d6816780
Merge pull request #15577 from Putnam3145/bring-beauty-back
...
Adds beauty back
2023-01-07 15:58:46 -03:00
Hatterhat
34eaf93a01
sorters! one-way setting! brazen code borrowing!
2022-12-29 20:18:34 -06:00
silicons
0712bb4c79
Merge pull request #15897 from LeDrascol/auto-lumi-eyes
...
Automatically implant High Luminosity Eyes
2022-12-21 12:38:13 -08:00
Hatterhat
f0a154106e
no more titanium req
2022-12-19 08:33:59 -06:00
Jerry Wester
5987f3ba13
revert holocall.dm
2022-12-17 18:21:23 -07:00
Jerry Wester
13f8559190
add springlock module
2022-12-17 16:54:41 -07:00
Darius
dd61704960
Automatically implant High Luminosity Eyes
...
Prevents the need for an auto-surgeon by automatically replacing the character's eyes on spawn.
2022-12-17 10:12:58 -05: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
Jerry Wester
19428e2579
revert bag dumping changes
2022-12-13 19:15:07 -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
Jerry Wester
7110d617b1
revert changes to outfit.dm
2022-12-12 15:24:23 -07:00
Jerry Wester
dae5190941
Remove sandstorm edit, fix suit storage
2022-12-11 20:45:46 -07:00
Jerry Wester
a4631070a8
revert some changes
2022-12-11 20:32:42 -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
PeriodicChaos
183b554ed3
modsuits part 1
2022-12-11 20:30:41 -07:00
SandPoot
8911fe5e0b
clear em
2022-12-11 17:58:45 -03:00
Timothy Teakettle
b7673e234f
add no hunger no breath
2022-12-09 13:30:10 +00: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
Hatterhat
38bd037b66
box that mf up
2022-10-04 14:14:04 -05: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
shellspeed1
a55b2c4ff3
ports https://github.com/tgstation/tgstation/pull/56375 . Credit to cacogen.
2022-09-20 20:05:59 -07:00
shellspeed1
b4f886d999
port of https://github.com/tgstation/tgstation/pull/49111 aka sales taggers, credit to ArcaneMusic
2022-09-18 20:55:22 -07:00
Hatterhat
1f0ad3e68c
its a lil janky but we take those ( #15834 )
...
Co-authored-by: Hatterhat <Hatterhat@users.noreply.github.com >
2022-09-17 13:47:24 -07:00
shellspeed1
d9e15776ee
Ports the RBMK reactor from both NSV using Hyper and Splurt code (WIP) ( #15847 )
...
* sprites and sounds
* The code for the reactor itself
* Update code/modules/power/reactor/rbmk.dm
Co-authored-by: Putnam3145 <putnam3145@gmail.com >
* Update code/modules/power/reactor/rbmk.dm
Co-authored-by: SandPoot <43283559+SandPoot@users.noreply.github.com >
* Map stuff
* Removes Clamps.
* Matrices separated, this was a mistake on my part.
* Update tgstation.dme
* removal as per putnam's review
* redfines highest available as 1007
* possible soundloop fix? probably not.
* temporary config thing to make engine load
* changes to map template from splurt
* Update code/modules/power/reactor/rbmk.dm
Co-authored-by: SandPoot <43283559+SandPoot@users.noreply.github.com >
* Update code/modules/power/reactor/rbmk.dm
Co-authored-by: SandPoot <43283559+SandPoot@users.noreply.github.com >
* actually somehow fixed the runtimes?
* old maps from hyper, not needed..
* Revert "old maps from hyper, not needed.."
This reverts commit 92ccd89952d360206926d8b57e82084994a6a0d6.
* take two on removal
* fixes power output
* Update code/modules/power/reactor/rbmk.dm
Co-authored-by: SandPoot <43283559+SandPoot@users.noreply.github.com >
* Update code/modules/power/reactor/rbmk.dm
Co-authored-by: SandPoot <43283559+SandPoot@users.noreply.github.com >
* deals with the double turf
* Revert "temporary config thing to make engine load"
This reverts commit 7f52188d5261cd60024ef36cf7c33df0748d0c79.
* was told to bring it back
* don't need to change these
* next time I'll just copy paste it instead of type it.
* a
* Flexi Seal crate so we can fix the reactor
* set power to 0 so it can be fixed
* nerfs power output
Co-authored-by: Putnam3145 <putnam3145@gmail.com >
Co-authored-by: SandPoot <43283559+SandPoot@users.noreply.github.com >
2022-09-17 13:33:51 -07:00
shellspeed1
1ebc2e584b
makes weapons unsafe
2022-09-17 06:53:46 -07:00
shellspeed1
91c095989a
stuff
2022-09-16 17:55:10 -07:00
shellspeed1
bc13bdb177
sort of working fire selector, still need to get the safety stuff figured out and finish getting the selector working properly
2022-09-09 22:23:05 -07:00
shellspeed1
1130a9341e
now it actually works
2022-09-09 20:02:45 -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
silicons
ad289629a7
Update _quirk.dm
2022-08-20 12:30:32 -07:00
silicons
1f5f6ce699
Merge pull request #15760 from Hatterhat/skill-issue
...
skill mod shuffle pr + implied complaining about why dont they reflect the actual skill xp levels themselves
2022-08-20 12:26:46 -07:00
timothyteakettle
2313a24918
Merge branch 'master' into dullahan-2-electric-boogaloo
2022-08-11 14:43:48 +01:00
Timothy Teakettle
b260794e54
Update dullahan.dm
2022-08-10 16:37:21 +01:00
Timothy Teakettle
e71686d8ac
fixes
2022-08-09 11:59:10 +01:00
Timothy Teakettle
8ee01d0bc4
Update dullahan.dm
2022-08-09 11:08:52 +01:00
Timothy Teakettle
a9f77d9344
let it retry for up to a minute
2022-08-08 16:38:02 +01:00
Timothy Teakettle
529ada40ef
auto retry
2022-08-08 16:36:15 +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
