Commit Graph

312 Commits

Author SHA1 Message Date
QuoteFox
aa2280113d Merge pull request #785 from DragonTrance/this-is-my-3rd-branch-i-hate-github-sometimes
Expander + VTEC upgrades Fix (times two)
2021-01-01 02:26:01 +00:00
QuoteFox
1f4c328d0d Merge pull request #795 from DragonTrance/granters-indication
Gives book granters an indication to how far until you master the subject
2021-01-01 02:24:30 +00:00
DragonTrance
e452c22972 book granters indicate progress 2020-12-31 13:44:47 -07:00
kevinz000
10069637a5 Merge pull request #9441 from lolman360/whydowehave1000branches
Ports /tg/ advanced surgerytools and tool defines.
2020-12-30 00:42:50 -03:00
DragonTrance
529824b320 borg expander + vtec upgrades fix 2020-12-29 11:15:19 -07:00
QuoteFox
9c2c2a22e2 Merge pull request #773 from DragonTrance/deconstructing
Adds the Ability to deconstruct various objects
2020-12-28 19:34:37 +00:00
QuoteFox
d940287569 Merge pull request #777 from ArchieBeepBoop/drakeborg
Removes Drakeborgs
2020-12-27 08:59:00 +00:00
silicons
16cc9e35f7 Removes Drakeborgs 2020-12-27 05:55:38 -03:00
DragonTrance
9068e9c580 Update loom.dm 2020-12-25 14:14:52 -07:00
DragonTrance
57117b0017 why does my compiler do this i hate it 2020-12-25 13:39:51 -07:00
Ghom
0c8ed89992 Merge pull request #10705 from kevinz000/revert_poojawa_blood_1
Cleanup/Partial revert of RGB blood ""rework""
2020-12-25 17:30:06 -03:00
DragonTrance
162ae674c6 constructible showers, loom, sinks & barrels now deconstruct
Deconstruction:
Loom - Screwdriver
Wooden Barrel - Screwdriver
Sink - Wrench
Shower - Screwdriver > Wrench

Securing:
Loom - Wrench
Wooden Barrel - Wrench
Shower - Screwdriver

Adds showers as craftable objects when using metal sheets. Also organizes some things in the metal sheet crafting menu
2020-12-25 13:22:21 -07:00
QuoteFox
e6a7a295d2 Wash cum bug again
Muliple stacks break it..
2020-12-24 19:39:41 +00:00
QuoteFox
7fb3ed17f7 Merge pull request #755 from ArchieBeepBoop/reagentsagain
Ports reagents id removal and typepath usage
2020-12-23 17:48:37 +00:00
QuoteFox
7ea68c2cb0 Merge pull request #753 from Oposshim/Donk.Co
Donk.Corp-Port ✔️
2020-12-23 17:34:12 +00:00
Archie
41f0a84a87 Fire Extinguisher Reagents 2020-12-18 01:30:17 -03:00
Archie
48ede22c46 Merge remote-tracking branch 'upstream/master' into reagentsagain 2020-12-18 01:20:57 -03:00
CygnusB
e19743a4a7 Update ghost_role_spawners.dm 2020-12-10 02:48:03 -03:00
Lin
a7c539ac32 Ports reagents id removal and typepath usage. 2020-12-09 14:32:36 -03:00
Oposshim
6e66585d13 donk boxes list 2020-12-09 12:28:39 -05:00
Oposshim
cb79e145f9 box /var fix 2020-12-09 12:03:46 -05:00
Oposshim
dbcfc8855c Dank.Corp
More variety + bonus sprites.
2020-12-08 00:13:31 -05:00
Dahlular
4fb6256a99 Revert "Borg expander + VTEC fix" 2020-12-06 13:44:28 -07:00
Dahlular
40b1495ff3 Merge pull request #714 from DragonTrance/borgupgrade-fix
Borg expander + VTEC fix
2020-12-06 13:22:11 -07:00
CygnusB
ad8a067015 agonyyyy 2020-12-01 18:09:00 -03:00
Dahlular
ec85829dca Merge pull request #725 from Oposshim/another-nanotrasen-muh-lore-tweak
Posshim's fix - of a fix - of a fix - of a fix
2020-11-30 09:49:21 -07:00
Oposshim
c8cf5e2fb7 Posshim's fix - of a fix - of a fix - of a fix
I cannot be trusted with PRs.

I missed / messed up two things from the last pull.
2020-11-30 11:30:55 -05:00
QuoteFox
8437a3e472 Merge pull request #719 from TotallyNotADog/cleanNadeFix
fixes cleaner grenades hissing whenever they come into existence
2020-11-28 09:34:12 +00:00
Dahlular
29d35a5645 Merge pull request #721 from ArchieBeepBoop/rld
Nerfs RLDs because they hard counter nightmares and night ops.
2020-11-27 13:54:58 -07:00
Dip
4d197db9ea a 2020-11-27 16:03:45 -03:00
Dip
6057e3036e change costs 2020-11-27 16:01:59 -03:00
Ghom
6502fe255f Merge pull request #10586 from Tupinambis/RLDNerf
Nerfs RLDs because they hard counter nightmares and night ops.
2020-11-27 14:44:26 -03:00
Dahlular
238ab653c4 Merge pull request #707 from Oposshim/another-nanotrasen-muh-lore-tweak
Kinaris Corp 1.1.9
2020-11-27 07:40:04 -07:00
TotallyNotADog
f9137afb8a replace glass with plastic 2020-11-25 16:01:13 -06:00
DragonTrance
a297b6f05c 2 2020-11-22 14:14:50 -07:00
Dahlular
0884fc0f66 Merge pull request #704 from ArchieBeepBoop/dummyruntimes
I'M FIXING THESE RUNTIMES, WITH NO SURVIVORS.
2020-11-21 23:03:08 -07:00
Dahlular
fa5e05c44c Merge pull request #702 from ArchieBeepBoop/idbullshitpart3
Cleaning up ID Console code and other tweaks - The "I want to die" edition
2020-11-21 23:00:50 -07:00
Dahlular
6645e50dad Merge pull request #694 from ArchieBeepBoop/improvements
ATMOS Firelocks and more
2020-11-21 22:54:02 -07:00
Dahlular
7ca1b3084b Merge pull request #691 from ArchieBeepBoop/radioactivedecal
Adds a radioactive type of greenglow cleanable decal
2020-11-21 22:52:05 -07:00
Poss
27ec04f7a1 Update radio.dm 2020-11-21 22:16:32 -05:00
Poss
c77574bf10 Update cigs_lighters.dm 2020-11-21 21:58:18 -05:00
Oposshim
bb1694f301 Kinaris Corp 1.1.2
another long overdue haul of shit I forgot/was to busy to get the first patch around.
2020-11-21 12:05:56 -05:00
Dip
f2bf2235c3 ahem 2020-11-21 03:05:32 -03:00
Dip
ccd2d137b7 Fixes some dummy thicc runtimes 2020-11-21 03:03:27 -03:00
kevinz000
c7db7cb2be The ID Code Cleanup and Fixening (tm) 2020-11-20 20:55:27 -03:00
kevinz000
14b3fa22ce Merge pull request #9404 from Poojawa/qm-is-a-head
QM is a head of staff, Cargo ID Console added
2020-11-20 20:12:42 -03:00
Dahlular
7b1991a42a Merge pull request #689 from ArchieBeepBoop/darts
Tweaks smartdarts with a few quality of life functions, and add a few new things.
2020-11-19 23:23:17 -07:00
Dahlular
04e21a02ab Merge pull request #688 from Chemlight/Ashwalkers-lets-not
Ashwalkers to station for no raisen
2020-11-19 23:22:33 -07:00
Dahlular
2e58f6ebb7 Merge pull request #687 from ArchieBeepBoop/mutation
Fixes mutations runtiming left and right / owner not being set in mutation
2020-11-19 23:22:12 -07:00
Dahlular
79d678fe19 Merge pull request #678 from ArchieBeepBoop/teleportfixes
[Testmerge] Mass fixing Teleporter issues + Implant Location Refactoring and Fixes
2020-11-19 23:18:37 -07:00