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
silicons
fbf7a2de90
Merge pull request #15853 from shellspeed1/posialert-console
...
Port of the Posialert console from hyper. Credit to jjpark-kb for initial work.
2022-09-23 16:21:19 -07:00
shellspeed1
cdb1fbb1e2
port of https://github.com/tgstation/tgstation/pull/54029/files# Aka this is where we get bounty cubes and remove the public bounty console. Credit to ArcaneMusic.
2022-09-18 21:55:10 -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
shellspeed1
3dace329be
adds public bounty consoles without inflation, also removes the mint
2022-09-17 19:27:40 -07:00
shellspeed1
d83747dc74
Ports Quantum Spin Inverter from TG. ( #15846 )
...
* ports bluespace swapper
* fixes materials so we can print quantum spin inverters
* its diamond not diamoond
2022-09-17 13:39:32 -07:00
shellspeed1
527b85e4a4
woopsie
2022-09-17 02:00:47 -07:00
shellspeed1
59ef5bbcf1
port of the positronic alert console
2022-09-17 01:55:55 -07:00
Putnam3145
617768dd40
Destructive analyzer no longer buy one get 49 free
2022-09-02 15:09:15 -07:00
SandPoot
75dd6a67df
just a little check for if there's anything at all
2022-07-19 21:32:49 -03:00
Putnam3145
6fe08f0a4e
Rebalancing QCD a bit
2022-06-06 20:41:10 -07:00
deathride58
113981b5a8
Jukebox refresh - Jukebox queue, preliminary multiz support, working volume knob, and more!
2022-05-21 00:21:58 -04:00
Lin
95416bbedc
Merge pull request #15587 from TomGarou/Synth-Brainwashing
...
Synth Brainwashing AKA Reprogramming
2022-05-12 20:29:04 +00:00
Lin
dec7751f95
Merge pull request #15612 from SandPoot/status_displays
...
Syncs status displays to tg's version
2022-05-12 20:11:54 +00:00
SandPoot
90eab441aa
Upload files
2022-05-09 18:50:17 -03:00
silicons
ce7d7a5124
Merge pull request #15594 from SandPoot/stasis-beds-update
...
Makes stasis beds *slightly* less hated
2022-04-27 16:11:34 -07:00
silicons
13f326c939
Merge branch 'master' into Synth-Brainwashing
2022-04-15 17:44:30 -07:00
SandPoot
5d4bae4482
Update files
2022-04-10 23:27:12 -03:00
SandPoot
695835fcd6
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Initialize(mapload)
2022-04-09 00:03:13 -03:00
silicons
dee1db4a3a
Merge pull request #15558 from SandPoot/mechs-are-vehicles
...
/obj/mecha ➡ /obj/vehicle/sealed/mecha
2022-04-08 18:26:47 -07:00
TomGarou
59874f6553
Synth Brainwashing
...
Adds synthetic brainwashing to Citadel-Station-13
2022-04-08 01:26:07 -04:00
SandPoot
586a035132
Update files
2022-04-06 18:41:31 -03:00
silicons
c8cab13081
Merge pull request #15565 from SandPoot/custom-statues
...
Custom statues and sculpting changes.
2022-04-06 12:12:24 -07:00
BlueWildrose
3687361ba5
Butts, nuts, n' tats. (please testmerge or merge & deploy before Halloween ball) ( #15304 )
...
* Butts
* testicle fix + hidden is back
* updated booba
* prob bad idea actually thinking about icon states
* fuck
* this should be everything now
* SandPoot's suggestion
Co-authored-by: SandPoot <43283559+SandPoot@users.noreply.github.com >
* tguify that last option
* Revert "tguify that last option"
This reverts commit f9d7a075e997e3d9c0a4f641db43343796cecb98.
* Revert "Merge branch 'master' into cursingcitadel"
This reverts commit 2998b1908a74b381857056f5ce6b34894d950c06, reversing
changes made to 6fc65a28fa4f6012c70675b4cbc0299d7740912a.
* Revert "Revert "Merge branch 'master' into cursingcitadel""
This reverts commit c4a2ad1a630b6376801df3e1cec88aad3d2935ea.
Co-authored-by: SandPoot <43283559+SandPoot@users.noreply.github.com >
Co-authored-by: Putnam3145 <putnam3145@gmail.com >
2022-03-30 20:06:00 -07:00
SandPoot
189716314f
Would you like some defines in these trying times?
2022-03-23 12:10:02 -03:00
SandPoot
16fddbb140
Upload files
2022-03-18 18:35:29 -03:00
SandPoot
aec888a7b6
Update files
2022-03-16 15:17:57 -03:00
SandPoot
a8f454bd72
Upload files
2022-03-16 14:00:31 -03:00
Putnam3145
b597675ef4
Fix explosive compressor impossibility
2022-03-14 11:41:20 -07:00
silicons
a3284a0923
Merge pull request #15195 from DeltaFire15/med-revivalchem-nerf
...
Weakens chemistry's revival chems
2022-03-13 14:24:57 -07:00
silicons
bf9afd846d
Merge pull request #15528 from SandPoot/time-to-kill-this-broken-system
...
[PORT] Removes the non bitflag slot defines
2022-02-26 18:08:28 -07:00
silicons
fe427e7516
Merge pull request #15503 from Arturlang/Bodybuilding
...
Lets the limbgrower make mobs with only a chest
2022-02-26 18:08:12 -07:00
SandPoot
f7ea1f377d
oops, replace all is a hell of a drug
2022-02-25 17:09:31 -03:00
SandPoot
5029af901b
Upload files
2022-02-25 16:58:09 -03:00
keronshb
f1ca283318
Merge branch 'master' into familyport
2022-02-11 14:04:57 -05:00
Artur
fc6f3cdffc
tested and done, seems to work
2022-02-11 16:54:05 +02:00
Artur
345c1616f2
Adds a way to build bodies using the limbgrower
2022-02-10 18:49:24 +02:00
DeltaFire
04d806c700
orange
...
stabilized orange can now cool at most 5 per tick instead of infinite
robots only cool half, which means 5 per life tick (status effects fire twice per life tick total)
for robots, it cools towards ~ -100°C target temp, provided you are in a location that supports it.
2022-01-31 00:50:22 +01:00
DeltaFire
074fe5b417
a bunch of stuff
...
5° min temp adjustment for active cooling
150% max total cooling efficiency as opposed to 100%
passive heating cools instead at >100% efficiency (to -30°C min)
EMPs jam cooling system readouts.
Nanogel is now printable, for a decent price though it needs a bit of diamond.
2022-01-02 19:44:35 +01:00
silicons
72a169e336
Merge pull request #15426 from Putnam3145/better-science-log
...
Fixes science per-minute output
2021-12-11 17:46:22 -08:00
Putnam3145
13834847e0
it works better when you're actually using a delta
2021-12-11 17:04:05 -08:00
DeltaFire
50be57f107
grrrr
2021-12-08 18:33:06 +01:00
DeltaFire
04797a961b
linters b gone
2021-12-08 05:07:22 +01:00
shellspeed1
76324ed06a
Update code/modules/research/designs/medical_designs.dm
...
Co-authored-by: Putnam3145 <putnam3145@gmail.com >
2021-11-12 15:17:49 -08:00
shellspeed1
71a4b7ba00
Update code/modules/research/designs/medical_designs.dm
...
Co-authored-by: Putnam3145 <putnam3145@gmail.com >
2021-11-12 15:17:39 -08:00
keronshb
9153115566
Merge remote-tracking branch 'upstream/master' into familyport
2021-11-05 10:50:08 -04:00
shellspeed1
026ce5dec4
tiny bit more polish, some number tweaks, and research.
2021-10-31 04:18:15 -07:00
keronshb
8978ee10fe
Merge remote-tracking branch 'upstream/master' into familyport
2021-10-28 14:41:46 -04:00
Letter N
bcdf96f274
Revert "TGUI alerts, lists, inputs"
2021-10-28 12:17:29 +08:00
SandPoot
13d7a166fe
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into tgui-alerts-and-what-not
2021-10-27 13:54:49 -03:00
