Nadyr
05407f585a
Merge pull request #5551 from CHOMPStation2/upstream-merge-14330
...
[MIRROR] Uplink and Pouch Tweaks
2023-01-27 09:27:06 -05:00
Nadyr
f08f632ed4
Merge pull request #5539 from CHOMPStation2/upstream-merge-14327
...
[MIRROR] Makes all carpet types orderable and gives them tile icons
2023-01-27 09:16:47 -05:00
Razgriz
6e4c340437
Merge branch 'master' into upstream-merge-14234
2023-01-24 17:23:08 -07:00
Razgriz
b7a52881ac
no
2023-01-24 17:19:09 -07:00
Razgriz
47605086f1
no
2023-01-24 17:18:37 -07:00
Razgriz
87d276be68
no
2023-01-24 17:18:19 -07:00
Razgriz
a2454795f9
no
2023-01-24 17:16:00 -07:00
Razgriz
d70cc76a45
Spelling
2023-01-21 22:26:21 -07:00
Razgriz
f79f283ed4
spelling
2023-01-21 22:25:36 -07:00
Razgriz
9197e1b95d
Merge branch 'master' into upstream-merge-14220
2023-01-21 22:24:10 -07:00
Razgriz
418643dce3
unfucc exploration
...
please do not the department
2023-01-21 22:21:39 -07:00
Heroman3003
bacd229d6c
adds the ability to use mind-based character directories
2023-01-22 01:42:32 +00:00
Razgriz
656f63ef1e
Change out cargo frontier phasers crates to standard phaseguns
2023-01-20 18:53:29 -07:00
Heroman3003
0d71022b2a
Merge pull request #14348 from squib-bot/clothes
...
Adds new Undergarment selections
2023-01-19 03:20:53 +00:00
Heroman3003
08935eea03
Merge pull request #14330 from Novacat/nova-basicfixes
...
Uplink and Pouch Tweaks
2023-01-16 08:45:22 +00:00
Heroman3003
fa1f8bb5b4
Makes all carpet types orderable and gives them tile icons
2023-01-13 22:00:36 +00:00
Verkister
c253bf1137
Makes round vore stats little more honest
...
Kind of silly to report 30 individual people getting eaten if a 3 person crew simply consisted of two preds playing belly tennis with a single preything :v
2023-01-07 17:40:08 +02:00
Heroman3003
165d947e91
Fixes autolathe, material and smartfridge issues
2022-12-28 21:48:06 +00:00
Razgriz
729c5baf1c
Merge pull request #5441 from Verkister/totallytubular
...
Adds some funky fresh simplemob features and a big fat bird.
2022-12-26 13:13:01 -07:00
Razgriz
14830c8729
Merge pull request #5443 from CHOMPStation2/upstream-merge-14235
...
[MIRROR] Fixes critical inventory equipment bug
2022-12-26 12:27:42 -07:00
Verkister
0a7823f3b0
Merge branch 'master' into totallytubular
2022-12-26 21:26:16 +02:00
tacoguy7765093
9185b2299f
Makes Glucose a craftable reagent and uncomments VOREstation removal from sweatmaxes. ( #5409 )
...
* Gives glucose a crafting recipe and un comments sweatmax glucose.
* slash
* nerf this
* Moving glucose pens to medical tab
2022-12-26 12:13:22 -07:00
Verkister
4991545221
Makes mob ai neutral and adds cargo pack
2022-12-26 13:53:22 +02:00
Casey
695e39e30c
Fixes some Oversights
2022-12-24 08:36:14 +00:00
Casey
ece7dbb2f2
Merge pull request #14235 from Heroman3003/inventory-fix
...
Fixes critical inventory equipment bug
2022-12-24 06:25:59 +00:00
Casey
764e792895
Remove the Exploration Department
2022-12-23 16:21:39 +00:00
Razgriz
ba4b775d6c
Merge branch 'master' into upstream-merge-14206
2022-12-15 15:24:53 -07:00
Novacat
1e7cbec2e3
Missing href token adds
2022-12-15 20:43:47 +00:00
Novacat
607d70ca67
Merge pull request #14203 from Heroman3003/material-fixes
...
Fixes autolathe thing.
2022-12-15 20:43:41 +00:00
Casey
b461e2fd06
Ticket Printer!
2022-11-21 06:42:48 +00:00
Nadyr
223ffff44d
powder that makes you say yes
2022-11-18 03:50:08 -05:00
Casey
dff8d7183a
Shortwave Headsets Crate
2022-11-18 06:40:02 +00:00
Casey
5232e9cd2d
Merge pull request #14009 from Heroman3003/material-runtime
...
Fixes inserting sheets with no defined material (like tiles) into machines
2022-10-30 15:26:17 +00:00
Nadyr
4157a6dc1b
Merge pull request #5202 from CHOMPStation2/upstream-merge-14002
...
[MIRROR] [MIRROR] Snowmobiles and Quadhancements V2
2022-10-29 19:21:34 -04:00
Heroman3003
0010d61709
[MIRROR] Snowmobiles and Quadhancements V2
2022-10-29 07:40:19 +00:00
Heroman3003
4a38648ead
Merge pull request #13974 from TheDavestDave/cargo-update
...
lets cargo order a pair of great tits
2022-10-29 07:38:10 +00:00
Casey
a452b89e36
Merge pull request #13943 from FunnyCatEnjoyer/FunnyCat2
...
Adds the tactical AR visor.
2022-10-23 18:53:11 +00:00
Nadyr
0773b248d8
Merge pull request #5121 from CHOMPStation2/upstream-merge-13884
...
[MIRROR] Adds more sock variants
2022-10-11 20:44:51 -04:00
Casey
2efa0bfcf0
Merge pull request #13884 from Cameron653/TRANS-SOCKS
...
Adds more sock variants
2022-10-10 03:09:50 +00:00
Casey
86ee514421
Merge pull request #13855 from Cameron653/overlay_madness
...
Upgrades OverlaySS. Fixes #3627
2022-10-10 03:02:27 +00:00
Razgriz
cd0e5fd00a
Merge pull request #5068 from CHOMPStation2/upstream-merge-13828
...
[MIRROR] Blueprint Revamp.
2022-10-02 22:47:55 -07:00
Razgriz
2b204b9194
Port old point defense stuff I rage-closed
...
Tech-debt repo-man called
https://github.com/CHOMPStation2/CHOMPStation2/pull/1790
2022-10-02 21:39:21 -07:00
Casey
892960d661
Blueprint Revamp.
2022-10-02 17:59:49 +00:00
Razgriz
dfb2ec2fb4
Revert "Revert "Vox security rigsuit""
2022-09-23 00:00:48 -07:00
Razgriz
b1059fb2a4
Revert "Vox security rigsuit"
2022-09-22 22:27:09 -07:00
Razgriz
422c35eb8e
Merge pull request #4852 from crabcube/master
...
Vox security rigsuit
2022-09-22 22:26:29 -07:00
Razgriz
ddb814a248
Merge pull request #5011 from CHOMPStation2/upstream-merge-12899
...
[MIRROR] [MIRROR] Adds Sjorgen Inertial Shotgun (by H-H) (ABLE TO BE MERGED)
2022-09-22 22:17:56 -07:00
Razgriz
64a7d9a36d
Merge pull request #5010 from CHOMPStation2/upstream-merge-12971
...
[MIRROR] [MIRROR] Bartending enhancements (ABLE TO BE MERGED)
2022-09-22 22:17:43 -07:00
Razgriz
fa6ecc5cee
Merge pull request #5004 from CHOMPStation2/upstream-merge-13467
...
[MIRROR] [MIRROR] conk rete (ABLE TO BE MERGED)
2022-09-22 22:10:59 -07:00
Razgriz
1e6801db96
Merge pull request #5016 from CHOMPStation2/upstream-merge-13460
...
[MIRROR] [MIRROR] Antag Uplink Medical Adjustments (ABLE TO BE MERGED)
2022-09-22 21:59:31 -07:00
