9153115566
Merge remote-tracking branch 'upstream/master' into familyport
2021-11-05 10:50:08 -04:00
b2459a26a3
Merge pull request #15306 from keronshb/dynamicadjustments
...
Adjusts Dynamic requirements to be more lienent (less 24/7 traitor and maybe a chance for something else holy shit)
2021-11-04 16:27:58 -07:00
1277df1013
typod
2021-11-04 22:02:51 +01:00
5cd49dcfd1
preservahyde
2021-11-04 21:20:27 +01:00
5d6978bb2f
oh god oh fuck
2021-11-04 21:06:42 +01:00
798f1ae879
and fixes suffocation with literally 0 gas
2021-11-04 09:04:48 -07:00
f83cd7b57d
Lung changes: reckoning
2021-11-04 08:52:50 -07:00
580e398e38
minor bug fix, also inhand sprites
2021-11-04 02:33:12 -07:00
74c6e05dd7
Merge pull request #15318 from silicons/evil
...
removes some evil defines from the code
2021-11-04 04:32:48 +00:00
e20b5f7c92
Dynamicadmins
...
Messages admins if dynamic fails to hijack
2021-11-03 22:39:20 -04:00
3090194042
adds sprite
2021-11-03 18:48:38 -07:00
c7fb7dd90f
lower honey + metadata
2021-11-03 14:16:36 -04:00
2a4968489d
10-30
2021-11-02 09:31:54 -04:00
7816417c32
tree fix and balance honey
2021-11-02 06:31:15 -04:00
e10397777c
Update ash_tree.dm
2021-11-02 06:06:23 -04:00
aba3720f22
Merge pull request #15319 from Citadel-Station-13/silicons-patch-3
...
readds gps to bdm
2021-11-01 17:08:33 -07:00
efd12e4fd5
Changes for merge
2021-11-01 12:07:44 -04:00
087e00be1c
New line linnet thing
2021-11-01 11:40:01 -04:00
5bd9b440a9
Ashen tree!
2021-11-01 11:27:42 -04:00
d92a290960
Update crayons.dm
2021-11-01 01:50:30 -03:00
05717c7ae3
Upload files
2021-11-01 01:24:47 -03:00
973d471dd4
woopsie
2021-10-31 05:04:08 -07:00
026ce5dec4
tiny bit more polish, some number tweaks, and research.
2021-10-31 04:18:15 -07:00
f148eb0a4c
minor cleanup
2021-10-31 03:24:24 -07:00
027509b55a
reloading fix
2021-10-31 03:16:24 -07:00
7166ead8bd
Uses vial as chem pool.
2021-10-31 01:28:49 -07:00
56fcd2dc9f
basic ability to load hypovial added
2021-10-31 00:48:56 -07:00
fb7d2a8ef3
smart dart initial
2021-10-30 19:35:09 -07:00
b6ad2f6a6b
Merge pull request #15312 from keronshb/evergreen
...
The grinch can no longer steal Christmas.
2021-10-30 14:08:59 -07:00
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
b58d3f14a3
More adjustments
2021-10-30 10:24:58 -04:00
eb7fd90d3f
Update blood_drunk_miner.dm
2021-10-30 03:31:57 -07:00
f9ce0759a3
indentation moment
2021-10-30 14:25:44 +08:00
89f7cf1c32
i apparently didnt commit this?
2021-10-30 13:46:54 +08:00
a32eabb7ae
fix
2021-10-29 22:44:01 -07:00
1fc778f70a
soundloop fix. also it gets deleted (woo)
2021-10-30 13:16:31 +08:00
186b552103
merge
2021-10-29 21:50:58 -07:00
ec85d5575d
sus login
2021-10-30 12:23:35 +08:00
a057139c33
Merge remote-tracking branch 'origin/master' into what-should-i-name-this-branch
2021-10-30 11:54:20 +08:00
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
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
739da5d69b
Merge pull request #15313 from DeltaFire15/codemoment
...
Fixes dragging things over prone individuals
2021-10-29 17:43:13 -07:00
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
133225c083
Removes required enemies
2021-10-28 23:48:50 -04:00
02eb4685a9
Some adjustments
2021-10-28 23:44:02 -04:00
451025af28
fix
2021-10-29 01:42:28 +02:00
e531c7b452
Fix
2021-10-28 18:48:26 -04:00
b2a890269a
Fixes destroy
2021-10-28 15:44:08 -04:00
29a39ed9ea
Indestructable change
2021-10-28 15:30:00 -04:00
8978ee10fe
Merge remote-tracking branch 'upstream/master' into familyport
2021-10-28 14:41:46 -04:00
keronshb