b487573064
Revert "Finally, MultiZ Layenia"
2022-07-09 13:52:49 -06:00
e51460cb5d
Revert "Merge branch 'master' into fairylights"
...
This reverts commit 294772765991063fe882
2022-07-09 04:55:33 -06:00
786de72e02
Merge pull request #1643 from alobama/ifixthefuckignblood
...
ratman's blood drive fixery + neurotoxin is gone !!!
2022-07-06 19:30:13 -06:00
98bef7ce83
adjusted bounties
...
removed neurotoxin, fixed blood drive
2022-07-06 21:22:38 -04:00
0cc2229789
Revert "Ports tgstation's Color Standardization, adds Color Defines and Signals"
2022-07-06 17:15:00 -06:00
f3fe268d0c
Ports color standardization
...
from tg/52574
2022-06-06 11:58:34 -04:00
8d5bbb45cc
Fixing typos I found
...
Yeah its 2 typos but any at all annoy the heck out of me
2022-04-02 23:36:32 +02:00
ec3eccca20
fixes some bounty typos
...
"defibrillartors" is probably an intentional typo, buuuut doesn't really fit.
2022-03-25 23:08:47 -05:00
21e555a14f
refactoring for TGUI3, part 1
2022-02-28 19:34:37 -09:00
66962a8816
first attempt at implementing TGUI 3
...
trying to update from TGUI Next to TGUI 3, so we can later upgrade from TGUI 3 to TGUI 4.
2022-02-26 16:43:25 -09:00
f841f785d0
Exports for metal and glass objs
2021-11-25 19:57:52 -08:00
5758c66520
Carpentry VS paperwork
2021-11-16 19:55:25 -08:00
c77c125034
Layenia Map Update w/ Cargo
2021-11-14 01:39:59 -08:00
7530d45e25
Merge pull request #10997 from Owai-Seek/tinytweaks-2-9-20
...
Sprites, Tweaks, and Snacks, QoL
2021-11-01 15:28:53 -03:00
d91fed1b2a
Paperwork desc
2021-11-01 00:34:40 -06:00
fa0fc6ffb9
All vending machines get restocks.
2021-10-30 18:29:07 -03:00
ab8b9f08c9
Import part two.
...
added alt click to rotate and added to cargo packs.
2021-07-28 20:27:34 -07:00
b01231fe6d
Boosts the price of the HEV suit crate
2021-07-15 18:52:19 -06:00
358b3cf0c0
Merge pull request #1315 from ArchieBeepBoop/rbmkfixes
...
Fixes some issues with the cargo RBMK / Gas nuclear reactors
2021-06-22 22:37:48 -06:00
7584df22b8
RBMK Fixes
2021-06-22 03:03:27 -03:00
6de7ffa2f5
Fixes a possible issue with areas in layenia & logs loan
2021-06-18 00:46:31 -03:00
3b85fab3dd
Merge pull request #1229 from ArchieBeepBoop/iconupdates
...
Ports: Icon state updates Part 1
2021-06-06 19:51:08 +01:00
a5cf94ab29
Merge pull request #10212 from Ghommie/Ghommie-cit471
...
Ports some hud and update_icon code updates.
2021-06-04 15:23:40 -03:00
6ea19bb7d2
Engislut
2021-06-02 18:20:06 -03:00
5e57fa38f6
Merge remote-tracking branch 'upstream/master' into RBMK_Branch_Simple
2021-05-05 14:49:01 -03:00
0867777fa0
Fuel rod rework + templates
2021-05-05 04:41:07 -03:00
5620f0a9ae
whoops.
2021-05-05 01:25:23 -03:00
e6b5742291
Improvements all around!
2021-05-05 01:23:37 -03:00
ebce3afd96
Bounty
2021-05-04 13:05:37 -03:00
21a7c1098d
Condom economy expasion
2021-05-04 12:01:54 -03:00
f3e05543f5
Funny TEG Update
2021-02-25 03:41:11 -03:00
9b8fc88089
datum + typo
2021-02-22 12:43:58 -07:00
f70a3f8277
botany fixes
...
Fixes crate datum, hydroponic chemical reactions requiring a seed, indentation, and spades not resetting life timers
2021-02-22 12:21:39 -07:00
3ebb7488de
Merge branch 'master' into plant-adding
2021-02-21 12:06:48 -07:00
84d8e1a44f
Update organic.dm
2021-02-21 11:01:51 -07:00
c729c61765
added tons of botany changes from citadel (not instability)
2021-02-21 09:57:29 -07:00
24cb27b67c
#5
2021-02-21 08:37:10 -07:00
1bfe8bb816
love in the air
...
no not really thats actually nerve gas
2021-02-13 21:51:56 -05:00
b2917ae057
Update costumes_toys.dm
2021-02-01 06:47:59 -05:00
e9aa0f67c8
I am a wizard, not a baboon brandishing a stick.
...
Any wizard bright enough to survive for five minutes was also bright enough to realize that if there was any power in demonology, then it lay with the demons. Using it for your own purposes would be like trying to beat mice to death with a rattlesnake.
2021-01-31 21:31:57 -05:00
17b20e3a3e
Sthefo.... stepo..... steto.... ssetho.....
...
THE THING YOU LISTEN TO THE HEART WITH DAMNIT
2021-01-29 16:06:02 -05:00
0b1a40baee
that's a lot of stuff heck
2021-01-28 18:28:48 -03:00
41c87b5e85
more wood stuff
2021-01-25 17:37:06 -03:00
d71a599224
cargo stuff
2021-01-22 21:42:38 -03:00
8ece699ed9
Merge branch 'master' into punishesarchie
2021-01-19 06:30:10 -03:00
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
9f0b22fa95
Code Cleanup + Cushions
2021-01-18 01:14:58 -07:00
b8996b962d
Merge pull request #898 from Dahlular/ikeacargo
...
REEEEEEEEEEEEEEEEEE
2021-01-17 04:24:26 -07:00
4c02fcc06f
REEEEEEEEEEEEEEEEEE
2021-01-17 04:22:20 -07:00
0fa8bff364
Merge pull request #897 from Dahlular/ikeacargo
...
Carpentry Part 1
2021-01-17 04:17:39 -07:00
Dahlular