QuoteFox
b39881f441
vending fix, wallet fix
...
vending fix, wallet fix
2021-02-04 23:40:40 +00:00
QuoteFox
a40e002595
loose ends.
...
more prices I missed
2021-02-04 14:20:17 +00:00
QuoteFox
c0de8ec3ac
some prices and lights I forgot.
2021-02-04 13:10:16 +00:00
QuoteFox
5584bb9522
Economy part 2 - Vendors
2021-02-04 12:42:50 +00:00
QuoteFox
409a221c42
Merge pull request #940 from VladinXXV/typo-hell
...
Quality of Life +1
2021-01-29 21:21:54 +00:00
Vladin
17b20e3a3e
Sthefo.... stepo..... steto.... ssetho.....
...
THE THING YOU LISTEN TO THE HEART WITH DAMNIT
2021-01-29 16:06:02 -05:00
QuoteFox
4980b0556d
Merge pull request #936 from ArchieBeepBoop/solar
...
Modular Solar Panels + Solar Tracker Fix + Compile issue fix
2021-01-29 20:38:48 +00:00
QuoteFox
3d1aabd694
Merge pull request #937 from quotefox/economy
...
Hyper Economy part 1 - Money Movement.
2021-01-29 01:18:58 +00:00
QuoteFox
9366e720fa
Merge pull request #935 from Kabramen/chairs
...
One step closer to become IKEA: More furniture to the new woodtypes, 3 new chair bounties + one stuff for loadout
2021-01-28 23:59:27 +00:00
Archie
d50b781203
SolarTest11
2021-01-28 20:22:08 -03:00
Kabra_men
0b1a40baee
that's a lot of stuff heck
2021-01-28 18:28:48 -03:00
Vladin
479c003c97
Do not fuck the bird.
...
Kenk plush can no longer be sex'd, as per his request.
2021-01-26 23:43:51 -05:00
Kabra_men
41c87b5e85
more wood stuff
2021-01-25 17:37:06 -03:00
QuoteFox
ecf93da4b1
Economy part 1
...
Economy part 1
2021-01-25 10:47:15 +00:00
QuoteFox
47f974d8dd
Merge pull request #918 from Kabramen/new-wood-types
...
New wood types + lavaland red grass
2021-01-22 08:45:11 +00:00
QuoteFox
867855f6f7
Fixes to doors and RCD now can print ANY door colour
...
Fixes to doors and RCD now can print ANY door colour
2021-01-21 14:24:55 +00:00
Kabra_men
6c0a7b1b39
WOOD
2021-01-21 03:09:52 -03:00
Archie
ec28d0f66d
Line ending conflict fix
2021-01-21 02:45:10 -03:00
nik707
858f994b5d
Adds: The Chad Plasmaglass Table
2021-01-21 02:44:06 -03:00
QuoteFox
75eb4d5696
New chairs and recipes!
...
New chairs and recipes!
2021-01-21 01:20:12 +00:00
Archie
ec3a68dc7a
Runtime man bad
2021-01-19 18:09:23 -03:00
CygnusB
520e075e39
Update secure.dm
2021-01-19 06:42:01 -03:00
CygnusB
8ece699ed9
Merge branch 'master' into punishesarchie
2021-01-19 06:30:10 -03:00
CygnusB
958b01f4d0
part 2
...
forgot a bunch of shit, also had to re-do parts because we don't have update_overlays()
2021-01-19 06:09:55 -03:00
CygnusB
f21db73775
fuck yeah
...
banana
2021-01-19 03:31:33 -03:00
Dahlular
9f0b22fa95
Code Cleanup + Cushions
2021-01-18 01:14:58 -07:00
QuoteFox
09b109c00b
lighter sound effects
...
as a smoker, I know the sound of the lighter is very important. (also removed Some WOW cool text)
2021-01-17 11:49:12 +00:00
QuoteFox
f806ffd48b
Merge pull request #891 from ArchieBeepBoop/cargo5
...
Small cargo crate revamp + QoL changes
2021-01-17 08:46:25 +00:00
kevinz000
7264218dca
Alien Furniture
2021-01-16 22:57:45 -03:00
Archie
12fde70d0c
Cargo Changes Initial
2021-01-16 17:40:43 -03:00
Chloe Carver-Brown
b49dc9536a
Adds footwraps as a roundstart and craftable shoe
2021-01-16 02:49:23 +00:00
Chemlight
403f4336db
Lotsa bus implants and ATV supply n' demand
...
Since Krav maga has an implant to toggle it on and on, I thought lets add everything else! (Aside from boxing, that for example is just tied to boxing gloves).
Also ATV's are too easy to get, make it need effort to buy and become speed racer.
2021-01-15 04:25:16 -08:00
CapnMachaddish
157c3722ac
no longer shitcode
2021-01-12 00:59:24 -06:00
QuoteFox
a875b9ffa7
condoms now fit in wallets.
...
condoms now fit in wallets.
2021-01-09 16:33:44 +00:00
Archie
65c316b35d
ID + Hex Color Sanity Fixes
2021-01-08 19:45:07 -03:00
Archie
c164b52b30
Merge remote-tracking branch 'upstream/master' into nexties2
2021-01-08 15:20:47 -03:00
QuoteFox
f1fbb326f9
Merge pull request #839 from Chemlight/I-Want-Easier-Less-Than-Lethal-Traitor
...
Syndicate Less Than Lethal option
2021-01-08 18:04:45 +00:00
Chemlight
b329c46061
Syndicate Lesss Then Lethal option
...
Thought I'd provide a better way on how to approach doing a maroon objective or rather theft antag related stuff. lately I've been seeing a lot of traitors go with the more lethal option for insurance.
2021-01-08 05:52:01 -08:00
Archie
78da9a5a12
Merge branch, update to current
2021-01-08 07:26:35 -03:00
kevinz000
939d8258de
Merge pull request #10813 from Ghommie/Ghommie-cit540
...
Unicode support updates from tgstation.
2021-01-08 07:11:56 -03:00
kevinz000
6bb4498919
Merge pull request #9658 from Ghommie/Ghommie-cit291
...
Fixing dogborg sleepers runtimes, how atrocious...
2021-01-07 15:22:39 -03:00
QuoteFox
cd4fe44bbf
Merge pull request #789 from Tename/boggers
...
Borg equipment changes
2021-01-07 00:17:31 +00:00
Lin
02da471330
Merge pull request #10238 from Ghommie/Ghommie-cit478
...
Brings in some mapping code updates.
2021-01-06 15:39:13 -03:00
Ghom
ca735a752e
Merge pull request #10505 from LetterN/beep-boom
...
better electropack ui
2021-01-06 14:57:15 -03:00
BlackMajor
02cb328921
Merge pull request #9747 from Ghommie/Ghommie-cit329
...
Fixing AI holopad speech text being small and whispers ending in multiple exclamation marks oxymoron.
2021-01-05 16:58:19 -03:00
kevinz000
5d80346f8f
Merge pull request #9993 from Ghommie/Ghommie-cit412
...
Ports tgstation loom changes, and durathred golems.
2021-01-05 16:54:23 -03:00
Putnam3145
0db5aed986
Merge pull request #10056 from Ghommie/Ghommie-cit430
...
Ports "Slightly improves visible and audible messages."
2021-01-05 16:51:22 -03:00
Archie
9e37d3be62
Fix merge conflicts
2021-01-05 03:41:08 -03:00
Archie
10e74b643e
Fix scanners.dm conflict
2021-01-05 03:31:28 -03:00
QuoteFox
bb83dfc24f
Merge pull request #823 from ArchieBeepBoop/morereagentfixesyeeeet
...
More reagent bullshit fixes YEEEEET
2021-01-05 06:21:13 +00:00
