Commit Graph

666 Commits

Author SHA1 Message Date
Letter N
021b28a2b7 cleanup
shitcode - b - gone
2021-01-20 11:08:21 +08:00
Lin
b7cf425dff Merge pull request #13988 from DeltaFire15/who-reads-these-anyways
[s] we love private orders
2021-01-08 01:08:31 +00:00
DeltaFire
e37790a997 fix 2021-01-07 00:23:18 +01:00
MrJWhit
abffac67b2 Port'n 2021-01-06 03:16:08 -05:00
silicons
c947dfdca5 Merge pull request #13940 from Chiirno/CargoParamedSuit
Paramedic EVA suit now purchasable from Cargo
2021-01-03 18:09:59 -07:00
Chiirno
6f5837d14f changed the description of the crate. 2020-12-31 17:42:07 -04:00
Chiirno
d936b43e98 adjusted the price to 1975. Above eva suit at 1500 and beow medical hardsuit at 2750 2020-12-31 17:27:25 -04:00
Chiirno
7d0c4030c9 first commit, adding the paramed eva suit as an option for cargo. 2020-12-31 17:24:30 -04:00
Xantholne
0db821f4f5 Fixes missing electus red from trying to be basic parrot and adds 2020-12-29 19:33:09 -07:00
Xantholne
51ac7286e6 aaaaaaa 2020-12-28 00:57:32 -07:00
Xantholne
2cca3314a7 Adds to bird crate 2020-12-27 23:55:58 -07:00
silicons
bff30f587b sigh 2020-12-23 09:16:16 -07:00
silicons
1b11005e09 fix 2020-12-21 13:51:27 -07:00
Hatterhat
2a05c9df24 mechs leave no wrecks on sell 2020-12-12 21:25:17 -06:00
MrJWhit
477330197c Huh we already had this 2020-12-10 01:14:43 -05:00
Putnam3145
9d300ade35 Merge pull request #13677 from silicons/newlines
Adds missing EOF newlines
2020-11-18 17:50:38 -08:00
DeltaFire
e0b2156142 fixes fixes fixes 2020-11-14 19:26:54 +01:00
silicons
803bff4e5f funny 2020-11-12 23:34:42 -07:00
silicons
19f1e99a8c mass ports like 15 tg prs + counting (#13386)
* changes

* ok

* changes

* sigh

* fixes

* changes

* fix

* fix

* alright

* fixes
git pus

* fix

* fix

* fix

* test

* ok

* Update code/modules/paperwork/ticketmachine.dm

Co-authored-by: Letter N <24603524+LetterN@users.noreply.github.com>

* ok

* compile and other stuff

* ok

* fix

* fix

* Fix

* Update menu.dm

* Update view.dm

* Update preferences.dm

Co-authored-by: Letter N <24603524+LetterN@users.noreply.github.com>
Co-authored-by: Putnam3145 <putnam3145@gmail.com>
2020-10-10 12:20:33 +02:00
silicons
655d505316 Merge pull request #13507 from LetterN/subsystem-updoots
Ports the better statpannel design, fixes missing icons, and fixes statvoting [ready]
2020-10-06 00:46:13 -07:00
Letter N
47845f2c30 suposed to be SSupdates but noo 2020-10-03 19:54:23 +08:00
Detective Google
643421bc23 adds arcade carpets
yay
2020-09-28 14:43:03 -05:00
silicons
07b28f40de Merge pull request #13359 from Ghommie/Ghommie-cit838
Turf visuals fix plus corrected names of a couple things.
2020-09-07 13:42:05 -07:00
Ghommie
4a04b22b72 Turf visuals fix plus corrected names of a couple things. 2020-09-06 18:53:01 +02:00
BlackMajor
1943a2fdd7 Merge pull request #13246 from silicons/anomaly_manufacturing
anomaly manufacturing port from tg. supermatter anomaly generation nerfed to 20% rather than removed
2020-09-06 17:53:35 +12:00
lolman360
94e24a9738 anvillan 2020-08-24 17:52:42 +10:00
silicons
b995581a11 changes 2020-08-23 05:33:19 -07:00
silicons
bd5766a8be changes 2020-08-23 05:27:53 -07:00
silicons
bc1fad653b Merge branch '13147' 2020-08-16 18:48:57 -07:00
silicons
01dd2f389b Merge branch 'pr-13067' 2020-08-16 18:38:13 -07:00
Lin
d287f44d9a Merge pull request #13045 from silicons/coggers
ports bronze (fake clockwork) airlocks and windows
2020-08-16 20:20:03 -05:00
Hatterhat
d8f5acfa22 i despise cargocode 2020-08-13 13:09:41 -05:00
DeltaFire
0f27a89e5d yeah this belongs into the armory
Hellgun single pack
goodies > armory
2020-08-10 18:41:56 +02:00
silicons
f20f01cc6b Merge pull request #12853 from LetterN/TGUI-4
TGUI4 port
2020-08-09 05:46:21 -07:00
silicons
8ef539b417 Merge pull request #13053 from kappa-sama/patch-39
makes cargo's Dirty Magazines 3x cheaper
2020-08-09 05:43:37 -07:00
Putnam
467f66b2a6 Removed crocin/hexacrocin. 2020-08-08 00:46:30 -07:00
Hatterhat
6f754188ac funny guns go pew 2020-08-07 18:02:33 -05:00
Letter N
5b63f0acce fix fix fix^2 2020-08-07 15:15:34 +08:00
kappa-sama
865970fcc3 lol 2020-08-06 21:34:25 -04:00
Letter N
333ca2cc7b Merge remote-tracking branch 'origin/master' into TGUI-4 2020-08-06 18:26:04 +08:00
silicons
815ddd1866 oh boy 2020-08-05 21:34:26 -07:00
Letter N
9a9e3ffef5 fixfixfix squared. Will not fix missing clockslab tabs, you just have to give it a category. 2020-08-03 21:14:17 +08:00
Letter N
a19e306137 less redtext - updates anomalies 2020-08-03 20:53:36 +08:00
Letter N
e40470f553 h. Updates NTOS, and axes p2p filetransfer! 2020-07-30 20:54:13 +08:00
Letter N
b376a6b6c4 Merge remote-tracking branch 'origin/master' into TGUI-4 2020-07-30 14:43:52 +08:00
Timothy Teakettle
9721025582 Merge branch 'master' into wounds-part-2 2020-07-29 15:47:44 +01:00
Letter N
5d4bb48628 another batch. MAJOR: ccpodlauncher, cargo/console.dm, smartfrige, holodeck/computer.dm, biogenerator 2020-07-29 15:10:01 +08: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
CameronWoof
df7a1f2b8d adds spaceman's trumpet seeds to the exotic seeds crate 2020-07-24 23:08:36 -07:00
timothyteakettle
8360bb1a7f section 2 2020-07-24 23:44:57 +01:00