silicons
98ff06fa1a
the roasted roasted roasted roasted roasted roasted roasted roasted......... ( #14850 )
...
* Update misc.dm
* Update code/game/objects/items/melee/misc.dm
Co-authored-by: Putnam3145 <putnam3145@gmail.com >
* Update misc.dm
Co-authored-by: Putnam3145 <putnam3145@gmail.com >
2021-06-21 17:54:56 +02:00
silicons
29604b939c
Update glowshroom.dm
2021-06-20 13:18:54 -07:00
silicons
8f3c1fe03a
Update glowshroom.dm
2021-06-19 07:02:51 -07:00
silicons
c0e3af55bc
Update glowshroom.dm
2021-06-19 06:59:26 -07:00
zerothebigboy
a64d94a7cc
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into beltsprites
2021-06-13 18:25:35 -04:00
zerothebigboy
bae89fcaba
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into beltsprites
2021-06-13 18:19:01 -04:00
zerothebigboy
319e03476b
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into miscsprites
2021-06-13 18:16:08 -04:00
silicons
431acd9d5c
Merge pull request #14820 from qweq12yt/more-cargo-stuff
...
[FIX] Some cargo related fixes
2021-06-13 15:15:20 -07:00
zerothebigboy
e757f9ea2c
thetwentythirdofmany
2021-06-12 17:41:09 -04:00
zerothebigboy
3fae79f876
thetwentyfirstofmany
2021-06-11 20:28:25 -04:00
zerothebigboy
b7eecc315f
theeighteenthofmany
2021-06-11 19:49:43 -04:00
zerothebigboy
53e95b7356
theseventeenthofmany
2021-06-11 19:48:04 -04:00
zerothebigboy
8a5a5ef6cc
thethirteenthofmany
2021-06-11 19:22:05 -04:00
qweq12yt
0ca61af62a
fixed combo lockers
2021-06-10 16:50:44 -03:00
silicons
a77aa8bd41
Merge pull request #14766 from Linzolle/cultfix
...
Fix cult area shenanigans, cult can do stuff in maint again.
2021-06-09 11:22:26 -07:00
silicons
0ee2892bee
Merge pull request #14807 from Putnam3145/make-sleeper-pref-good
...
makes medihound sleeper toggle do something
2021-06-09 11:17:39 -07:00
silicons
a7781f77fd
Merge pull request #14802 from bunny232/atmosfoam
...
Atmos resin buff? fix?
2021-06-09 11:15:56 -07:00
silicons
259aed7903
Merge pull request #14783 from DeltaFire15/spec-species-color
...
Colors species names depending on traits
2021-06-09 11:14:48 -07:00
silicons
fe8323f503
Merge pull request #14747 from keronshb/reinforcedplasmawindowsteps
...
Adds more deconstruction steps to stronger windows.
2021-06-09 11:13:13 -07:00
silicons
716c2a04e4
Merge pull request #14160 from keronshb/motivation
...
Adds a new traitor item, Motivation (Part 1)
2021-06-09 11:10:17 -07:00
Putnam
fcd1ec83cc
removed redundant check
2021-06-08 00:25:31 -07:00
Putnam
f6e08a8d2a
include a message too
2021-06-08 00:24:54 -07:00
Putnam
a236357ebe
makes medihound sleeper toggle do something
2021-06-08 00:21:19 -07:00
bunny232
7826ced174
Update effects_foam.dm
2021-06-06 12:54:07 -04:00
DeltaFire
dd33371a3b
colors
2021-06-01 22:48:57 +02:00
silicons
cb52be5dd9
fixes linter warnings ( #14778 )
...
* woo
* woo
2021-05-31 10:19:20 -05:00
Linzolle
0cf7c5070d
parentheses
2021-05-27 19:45:12 -05:00
Linzolle
46833abf0b
add cult_permitted area flag
2021-05-27 19:34:00 -05:00
keronshb
13b589507d
Clown Spawner
...
For admin fun!
2021-05-24 15:13:41 -04:00
keronshb
7458909970
Switched heated screws to solder.
2021-05-23 13:36:03 -04:00
keronshb
8787caccba
Fixes the roundstart deconstruction issue
2021-05-22 14:12:31 -04:00
keronshb
bd05dd29b6
ReinforcedPlasmaSteps
...
Adds more steps for deconning stronger windows
2021-05-22 13:58:01 -04:00
WanderingFox95
502092f284
changed sound path
2021-05-17 12:40:37 +02:00
WanderingFox95
1d56b9ceda
E-Fink
2021-05-17 12:31:46 +02:00
Timothy Teakettle
739b7cea26
borg spraycans have a five second delay before being able to knock someone down again ( #14627 )
...
* Update crayons.dm
* Update crayons.dm
* kevin review changes
* Update crayons.dm
* Update code/game/objects/items/crayons.dm
Co-authored-by: DeltaFire <46569814+DeltaFire15@users.noreply.github.com >
2021-05-14 17:47:40 +02:00
silicons
5601badbff
deterministic explosion system ( #13392 )
...
* wae explosions
* okay
* changes
* fixes
* fix
* ok
* ok
* kills more dead code
* okay
* fix
* ok
* tiles
* ok
* okay
* woops
* ok
* fix
* okay
* mob damage
* fixes
* insanity
* more
* more
* fixes
* more
* woot
* don't commit that
* YES
* fix
2021-05-12 05:44:53 -05:00
silicons
4afb5209a1
Merge pull request #14637 from TheObserver-sys/DerringerPass1
...
Derringer Pass 1: No Rest for the Wicked(ly Bad Coder {me})
2021-05-07 18:42:24 -06:00
silicons
44fdbaadcb
Merge pull request #14684 from zeroisthebiggay/pirates
...
Pirate Update: Milk Is Not A Medical Substitute
2021-05-07 18:40:41 -06:00
silicons
e8b7abcfc6
Merge pull request #14664 from WanderingFox95/WanderingFox95-TheUnrollingPin
...
The Unrolling Pin! (Ready)
2021-05-07 18:40:33 -06:00
silicons
97dcfd0750
Update effects_foam.dm
2021-05-06 02:02:25 -07:00
silicons
6ac964b35a
e
2021-05-06 01:52:35 -07:00
zerothebigboy
c8ebe720ec
k
2021-05-05 18:25:05 -04:00
zerothebigboy
5138d86655
skylarlineman'safurry
2021-05-05 03:35:25 -04:00
The0bserver
f1109c4f67
what a crate day (initial commit)
2021-05-01 02:15:07 -04:00
WanderingFox95
3ea98d3096
Merge branch 'master' into WanderingFox95-TheUnrollingPin
2021-04-29 10:54:00 +02:00
silicons
e3755fba92
Merge pull request #14639 from necromanceranne/cyberorgan_stuff_ye
...
Ports a significant amount of the tg cybernetic organ code + more
2021-04-28 21:20:57 -06:00
silicons
986aef27b2
Merge pull request #14648 from SandPoot/decal-painter-tgui
...
Decal Painter menu is no longer shit and has visible previews.
2021-04-28 21:20:24 -06:00
keronshb
6d86809616
Removes the Reinforcement Chromosome from Genetics. ( #14641 )
...
* Removes Mutadone Proof from Genetics
This might be a bit too good.
* Fixes so mutadone actually works
Oops
* Removes the reinforcement chromosome
Removes the reinforcement chromosome
2021-04-28 14:09:37 +02:00
WanderingFox95
b27c043760
Fixed a little error
2021-04-26 18:54:12 +02:00
WanderingFox95
6c9ead8f1c
Adds the Recipe to Wood Crafting
2021-04-26 18:42:33 +02:00
