shellspeed1
580e398e38
minor bug fix, also inhand sprites
2021-11-04 02:33:12 -07:00
Lin
74c6e05dd7
Merge pull request #15318 from silicons/evil
...
removes some evil defines from the code
2021-11-04 04:32:48 +00:00
shellspeed1
3090194042
adds sprite
2021-11-03 18:48:38 -07:00
Trilbyspaceclone
c7fb7dd90f
lower honey + metadata
2021-11-03 14:16:36 -04:00
Trilbyspaceclone
2a4968489d
10-30
2021-11-02 09:31:54 -04:00
Trilbyspaceclone
7816417c32
tree fix and balance honey
2021-11-02 06:31:15 -04:00
Trilbyspaceclone
e10397777c
Update ash_tree.dm
2021-11-02 06:06:23 -04:00
Putnam3145
aba3720f22
Merge pull request #15319 from Citadel-Station-13/silicons-patch-3
...
readds gps to bdm
2021-11-01 17:08:33 -07:00
keronshb
efd12e4fd5
Changes for merge
2021-11-01 12:07:44 -04:00
Trilbyspaceclone
087e00be1c
New line linnet thing
2021-11-01 11:40:01 -04:00
Trilbyspaceclone
5bd9b440a9
Ashen tree!
2021-11-01 11:27:42 -04:00
shellspeed1
973d471dd4
woopsie
2021-10-31 05:04:08 -07:00
shellspeed1
026ce5dec4
tiny bit more polish, some number tweaks, and research.
2021-10-31 04:18:15 -07:00
shellspeed1
f148eb0a4c
minor cleanup
2021-10-31 03:24:24 -07:00
shellspeed1
027509b55a
reloading fix
2021-10-31 03:16:24 -07:00
shellspeed1
7166ead8bd
Uses vial as chem pool.
2021-10-31 01:28:49 -07:00
shellspeed1
56fcd2dc9f
basic ability to load hypovial added
2021-10-31 00:48:56 -07:00
shellspeed1
fb7d2a8ef3
smart dart initial
2021-10-30 19:35:09 -07:00
DrPainis
5cb1388f11
Makes moving NOT give you nutrition anymore. ( #15316 )
...
* makes moving not make you fat anymore
* same as the previous commit, but even less coding
2021-10-30 18:00:13 +02:00
keronshb
b58d3f14a3
More adjustments
2021-10-30 10:24:58 -04:00
silicons
eb7fd90d3f
Update blood_drunk_miner.dm
2021-10-30 03:31:57 -07:00
silicons
a32eabb7ae
fix
2021-10-29 22:44:01 -07:00
LetterN
1fc778f70a
soundloop fix. also it gets deleted (woo)
2021-10-30 13:16:31 +08:00
silicons
186b552103
merge
2021-10-29 21:50:58 -07:00
LetterN
a057139c33
Merge remote-tracking branch 'origin/master' into what-should-i-name-this-branch
2021-10-30 11:54:20 +08:00
LetterN
99019166e4
i think it works
...
MAJOR antag backend update
- you cannot bruteforce the pen anymore
- uplink now uses bitflag to lock purchases
- poplock is handled entirely by the buyable uplink items
- tgui antag intro (for selected ones)
2021-10-30 11:45:50 +08:00
silicons
319c5e23fe
Merge pull request #15309 from LetterN/revert-15244-tgui-alerts-and-what-not
...
Revert "TGUI alerts, lists, inputs"
2021-10-29 20:27:46 -07:00
silicons
739da5d69b
Merge pull request #15313 from DeltaFire15/codemoment
...
Fixes dragging things over prone individuals
2021-10-29 17:43:13 -07:00
Lin
5054ea87ce
Merge pull request #15310 from keronshb/jaqincinerator
...
No Frollo you can't burn Jacq in the cremator with hellfire (plus two other grief prevention additions)
2021-10-28 21:29:50 -07:00
DeltaFire
451025af28
fix
2021-10-29 01:42:28 +02:00
keronshb
b2a890269a
Fixes destroy
2021-10-28 15:44:08 -04:00
keronshb
29a39ed9ea
Indestructable change
2021-10-28 15:30:00 -04:00
keronshb
8978ee10fe
Merge remote-tracking branch 'upstream/master' into familyport
2021-10-28 14:41:46 -04:00
keronshb
c80d65df73
Merge branch 'master' into familyport
2021-10-28 14:34:20 -04:00
keronshb
468b4a11ff
More buffs
2021-10-28 11:26:18 -04:00
LetterN
f7b898a2a9
frontend
2021-10-28 17:34:52 +08:00
LetterN
49940c373e
tgui backend
2021-10-28 12:51:31 +08:00
Letter N
bcdf96f274
Revert "TGUI alerts, lists, inputs"
2021-10-28 12:17:29 +08:00
silicons
a14549d07b
Merge pull request #15299 from Hatterhat/cgau
...
funny hands gaming - adds proto-kinetic gauntlets
2021-10-27 13:36:08 -07:00
SandPoot
13d7a166fe
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into tgui-alerts-and-what-not
2021-10-27 13:54:49 -03:00
SandPoot
67c6cc3fc0
tiny fix
2021-10-27 13:48:34 -03:00
silicons
679189cb3d
Merge pull request #15277 from Hatterhat/autoloom
...
i've been sitting on this a while but here have the AUTOLOOM
2021-10-27 05:13:40 -07:00
silicons
77116e110c
Merge pull request #15293 from Higgin/let-the-bodies-hit-the-floor
...
Makes bodies laying on the ground also act as obstacles to crawling.
2021-10-27 05:12:16 -07:00
silicons
d6d037de43
Merge pull request #15232 from Putnam3145/minesweeper-removal
...
Removes minesweeper
2021-10-27 05:11:48 -07:00
Artur
bfcdf83e55
buildmode mapgen tool save
2021-10-26 16:31:36 +03:00
WanderingFox95
4b13d1772c
[Ready] Bone Anvil and processable Bone ingots ( #15290 )
...
* Adding all the extra stuff
* whoops, slipped my last fix in here.
* bone balance
* 6 Goliaths + 3 Watchers + 1 Legion
* bumps the damage modifier down to 1.05
* More Bones.
* Undoes the undoing of the other fix PR
Co-authored-by: Emily <null>
2021-10-25 18:11:54 +02:00
deathride58
34e6187add
Merge pull request #15148 from Citadel-Station-13/silicons-patch-1
...
disables prisoners
2021-10-24 22:02:27 -04:00
Lin
e1aeaa76fd
Merge pull request #15280 from Putnam3145/siphoning-vents
...
Allows setting vents to siphon
2021-10-24 15:09:35 -07:00
Lin
5066e34736
Merge pull request #15258 from keronshb/pirate10k
...
Raises Pirate pay rate back to 10000 again.
2021-10-24 15:09:03 -07:00
Hatterhat
5dbadffe6b
wait a fucking second
2021-10-23 18:15:20 -05:00
