e7ddfdd8d8
Merge remote-tracking branch 'upstream/master' into TGUIs_Nexties
2020-02-02 13:31:54 +01:00
66a2216ef3
Merge pull request #10829 from Ghommie/Ghommie-cit544
...
Fixed and brutalized clown op slippery weapons a little.
2020-02-02 03:16:23 -07:00
c94b5688db
Merge pull request #10810 from YakumoChen/ring
...
Adds ring jewelry
2020-02-02 03:16:01 -07:00
33577e0d82
Merge pull request #10813 from Ghommie/Ghommie-cit540
...
Unicode support updates from tgstation.
2020-02-02 01:47:24 -07:00
2cdf7fa0bb
Merge pull request #10784 from Seris02/polycoats
...
polychromic winter coats
2020-02-02 01:46:58 -07:00
88c20b1ea5
Merge pull request #10834 from Trilbyspaceclone/patch-273
...
Craftable Crates!
2020-02-02 01:43:32 -07:00
3fc832fbe7
Merge pull request #10819 from Ghommie/Ghommie-cit541
...
clown ops infiltrator consistency.
2020-02-02 01:39:08 -07:00
664c4cdea9
Merge pull request #10831 from Citadel-Station-13/Ghommie-patch-1
...
Fixing chaplain armaments beacon edge case.
2020-02-02 01:38:34 -07:00
3337181cac
Merge pull request #10352 from Seris02/smchanges
...
Changes to the way SM handles power related to integrity and max integrity damage
2020-02-01 18:46:10 +01:00
33122d0d92
Merge branch 'master' into TGUIs_Nexties
2020-02-01 00:49:10 -08:00
4625d4f25d
Update sheet_types.dm
2020-02-01 01:56:41 -05:00
4b7e5916bf
Update crates.dm
2020-02-01 01:09:35 -05:00
fa40490915
Update sheet_types.dm
2020-02-01 01:08:14 -05:00
e7589715a8
Fixing chap armaments beacon.
2020-02-01 05:13:29 +01:00
07b6d278a1
fixed and brutalized clown op slippery weapons a little.
2020-02-01 04:48:40 +01:00
c46c683664
FIXES FANCY SWITCHBLADES
...
ONCE, AND FOR ALL MAYBE HOPEFULLY FINALLY. FUCK!!!
2020-01-31 21:12:08 -05:00
3519fbc909
F
2020-02-01 02:16:52 +01:00
c9e315a9e6
Merge pull request #10781 from r4d6/RPD
...
RPD icon reorder, less building pixelhunting
2020-02-01 01:48:59 +01:00
fddd79b466
Merge pull request #10777 from Citadel-Station-13/kevinz000-patch-4
...
Gangs can now only tag with GANG spraycans, rather than lathed spraycans
2020-02-01 01:44:19 +01:00
327bfcac2f
Merge pull request #10786 from Commandersand/frick
...
made the centcomm suit syndies order be a variant with no sensors
2020-02-01 01:42:55 +01:00
ab4aa29576
clown ops infiltrator consistency.
2020-02-01 00:02:31 +01:00
54cd2585cf
Merge remote-tracking branch 'upstream/master' into TGUIs_Nexties
2020-01-31 23:18:51 +01:00
4c4fda8091
line ending
2020-01-31 14:14:34 +00:00
89134d8b30
updates fancy
...
the boxes actually work now
2020-01-31 08:52:45 -05:00
d26ca9dbf0
Fixes this
2020-01-31 13:57:30 +01:00
1ed4b90e5f
update fancy
2020-01-31 07:14:58 -05:00
065691ca1e
adds ring boxes to fancy
2020-01-31 06:33:13 -05:00
188f726ffd
unicode support port wip
2020-01-31 05:32:00 +01:00
15e5f0ef5d
Merge pull request #10644 from ShadeAware/master
...
Craftable Switchblades: The Finale
2020-01-30 21:30:55 +01:00
83ce84cdc4
Merge branch 'master' into TGUIs_Nexties
2020-01-30 20:46:20 +02:00
27c915ec75
honk
2020-01-30 02:04:48 -06:00
dbb6218e0d
merp
2020-01-30 14:54:07 +08:00
e6e545b1f2
Merge pull request #9860 from Ghommie/Ghommie-cit374
...
Ports "Mime PDAs only accept emojis for messages, mime cartridge comes with an emoji guidebook"
2020-01-29 20:15:22 -07:00
1caa2af4cf
Update weaponry.dm
2020-01-30 04:05:35 +01:00
793cc26ddc
Update weaponry.dm
2020-01-30 03:28:47 +01:00
096d9e01e1
Update weaponry.dm
2020-01-30 03:19:04 +01:00
b2ca380a13
Update weaponry.dm
2020-01-30 03:15:24 +01:00
58b969b8c6
Update RPD.dm
2020-01-29 20:34:57 -05:00
0f4e30c2db
Update crayons.dm
2020-01-29 16:13:29 -07:00
7839724013
Merge pull request #10295 from Citadel-Station-13/kevinz000-patch-2
...
Brain surgery can now fix an abductee's mindsnap objectives
2020-01-29 05:34:49 +01:00
cf3466252e
Merge pull request #10694 from Citadel-Station-13/kevinz000-patch-4
...
[s] more reasonable reagent logging
2020-01-29 01:59:09 +01:00
3bf0e1d5c4
Merge pull request #10701 from Ghommie/Ghommie-cit527
...
Ported further runtime fixes by AnturK.
2020-01-28 17:57:26 -07:00
fbe79edc24
Merge pull request #10752 from Owai-Seek/cargocratetglass
...
6 More Crates
2020-01-28 18:08:58 +01:00
a1a2d45be6
Update closets.dm
2020-01-28 02:41:04 -07:00
5bc590ad52
Merge branch 'master' into cargocratetglass
2020-01-27 08:03:30 -05:00
21fe8be5dc
Mmmmm, more crates.
...
Fixed: Engineering Hardsuit Crate
Removed:
Duplicate Exotic Seed Crate
Festive Wrapping Paper Crate (Replaced)
Tweak:
Grouped some stuff in each tab. (Medical Kits, Space Suits, Ingredients, Meals)
Added Ambrosia Seed to Seed Crate
Added 2 Spray Cans to Biker Gang Crate
Moved:
Grill to Service
All Vending Supplies to a new tab.
Added:
Candle Crate
Dirty Magazine Crate (Emag)
CBT Interrogation Crate (Contraband)
Cargo Packaging Crate
Pest Control Crate (Contraband)
Candlelit Dinner Crate
Portable Air Pump Crate
Portable Scrubber Crate
Pastry Crate
Burger Combo Crate
Known Issues:
I don't know how to get randomised crates to show up in the proper order.
2020-01-27 07:00:40 -05:00
92398ae354
Why am I having such trouble with a fucking SPAN CLASS
2020-01-26 19:46:30 -05:00
f7373ae40d
WHY DID THE INDENTATION NOT SHOW IT WAS FUCKED UP BEFORE
...
WEBEDIT CHANGE WEBEDIT CHANGE REEEEEEEEEEEEEE
2020-01-26 19:42:21 -05:00
fffea32a59
Lets the user know they improved their switchblade.
...
Confusion is bad. Lets make it not confusing.
2020-01-26 19:26:58 -05:00
2cd6ed5f26
REEEE STRAY SLASHES
...
WHY CAN'T I DO THINGS RIGHT THE FIRST TIME
2020-01-26 16:31:00 -05:00
Artur