 Ghom
|
b36e44d983
|
Merge branch 'master' into Ghommie-cit724
|
2020-05-05 23:32:51 +02:00 |
|
|
kevinz000
|
56fe430a25
|
ok (#12119)
|
2020-05-05 23:18:09 +02:00 |
|
|
Lin
|
32204093b2
|
Merge pull request #12108 from Putnam3145/replace-pAI-button
Replaces the pAI candidate button with a ghost roles button
|
2020-05-05 20:54:57 +00:00 |
|
|
Ghommie
|
91d6faaf21
|
more obligatory changes.
|
2020-05-05 21:06:53 +02:00 |
|
|
Ghommie
|
81dde7debd
|
Obligatory.
|
2020-05-05 21:04:19 +02:00 |
|
|
Ghommie
|
001109cfcd
|
About ready.
|
2020-05-05 20:58:44 +02:00 |
|
|
Ghommie
|
ccfce7cb64
|
Makes wings/horns colors dna features instead of human defines
|
2020-05-05 06:22:58 +02:00 |
|
|
kevinz000
|
f50e661e0a
|
Merge pull request #12106 from Putnam3145/revert-supermatter
Reverts #10352.
|
2020-05-04 21:21:09 -07:00 |
|
|
Ghom
|
066479da5f
|
mandatory bump to savefile version.
|
2020-05-05 06:13:17 +02:00 |
|
|
kevinz000
|
395e3e41cc
|
Merge pull request #11874 from Ghommie/Ghommie-cit682
General taur visuals refactor and other things.
|
2020-05-04 20:52:33 -07:00 |
|
|
kevinz000
|
e26bf5b2af
|
Merge pull request #12115 from Kraseo/the-funny-aheal
Slow death of Mining PvP: Removes aheals from legion cores
|
2020-05-04 20:46:40 -07:00 |
|
|
Ghommie
|
3de0e545c0
|
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit682
|
2020-05-05 05:44:55 +02:00 |
|
|
Lin
|
0acec2e56f
|
vendors now accept dollar bills again (#12109)
* make vendors accept bills
* build
* forgot that function
* this is better
* i thought i had a hook for this
|
2020-05-05 05:38:19 +02:00 |
|
|
Ghommie
|
791b05871f
|
Hey.
|
2020-05-05 05:24:40 +02:00 |
|
|
Ghommie
|
f770586407
|
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit723
|
2020-05-05 05:09:29 +02:00 |
|
|
Ghommie
|
c34655d094
|
Uh uh.
|
2020-05-05 04:48:49 +02:00 |
|
|
Ghommie
|
0adca2d9b8
|
Oh.
|
2020-05-05 04:45:43 +02:00 |
|
|
Ghommie
|
643ef48f0e
|
Macros, generic skill implementations.
|
2020-05-05 04:42:34 +02:00 |
|
|
Lin
|
367bb0f71c
|
Merge pull request #12072 from Psody-Mordheim/browhatifweusedallthejobslotsduringroundstart
Lets actually use all the positions
|
2020-05-05 00:49:25 +00:00 |
|
|
Lin
|
e1c97d4261
|
Merge pull request #12090 from coldud13/radradio
Radiation collectors now alert engineers when empty
|
2020-05-05 00:47:23 +00:00 |
|
|
Lin
|
c3dfcf1cfe
|
Merge pull request #12104 from timothyteakettle/food-quality-2
sliced foods have the same quality as the item that was cut
|
2020-05-05 00:46:44 +00:00 |
|
|
Kraseo
|
f760919108
|
actually makes your speed reset to normal once the status is gone rather then when you get hit again
|
2020-05-04 21:06:15 +02:00 |
|
|
Kraseo
|
3cf7fd5105
|
pleases the travis god
|
2020-05-04 18:47:57 +02:00 |
|
|
Kraseo
|
c79ece7449
|
really surprised this wasn't done earlier
|
2020-05-04 18:30:27 +02:00 |
|
|
Ghommie
|
86c80dbbd9
|
Fixes felinid's cat ears and removes two unused variables.
|
2020-05-04 18:20:10 +02:00 |
|
|
Ghommie
|
87389243e6
|
r p g skills WIP.
|
2020-05-04 17:30:15 +02:00 |
|
|
Putnam
|
c1cd4d104f
|
Replaces the pAI candidate button with a ghost roles button
|
2020-05-03 20:31:11 -07:00 |
|
|
Putnam3145
|
bb2942d0b8
|
Fixes a gibber runtime. (#12103)
|
2020-05-04 05:05:13 +02:00 |
|
|
kevinz000
|
87858e8f60
|
Update sentience.dm (#12101)
|
2020-05-04 04:59:04 +02:00 |
|
|
Detective Google
|
f812cddf93
|
unfucks this and makes it use the icebox framework
|
2020-05-03 20:04:20 -05:00 |
|
|
Putnam
|
801956a1f9
|
Reverts #10352.
|
2020-05-03 17:44:00 -07:00 |
|
|
Timothy Teakettle
|
5f14ae28a1
|
food quality with sliced foods
yay
|
2020-05-03 23:06:54 +01:00 |
|
|
Lin
|
793cbd6cbd
|
Merge pull request #12094 from Ghommie/Ghommie-cit719
Makes privates not drop upon disembowelment or gibbing.
|
2020-05-03 21:24:44 +00:00 |
|
|
Ghommie
|
65899bf906
|
Removing cargo "paperwork" and a few other bloat packs.
|
2020-05-03 19:56:00 +02:00 |
|
|
kevinz000
|
8dee57b3d7
|
Merge pull request #12093 from Citadel-Station-13/Ghommie-patch-4
[s] Fixing a cargo exploit
|
2020-05-03 01:54:53 -07:00 |
|
|
Detective Google
|
2f99957711
|
fixes the snowed plating getting fucked when tiles are placed on it
|
2020-05-03 02:06:25 -05:00 |
|
|
Detective Google
|
e197513bcc
|
fixes lone ops and ninjas
|
2020-05-03 01:22:18 -05:00 |
|
|
Detective Google
|
bad9e76e50
|
Fixes pirates, ops, the mining base, and gives pirates and ops drills
|
2020-05-03 00:28:28 -05:00 |
|
|
Ghom
|
161da560b6
|
Update autolathe.dm
|
2020-05-03 07:17:18 +02:00 |
|
|
Ghommie
|
76e1ee80b7
|
Porting "Mobs now turn towards and are shifted based on grab state towards something pulling them"
|
2020-05-03 07:12:41 +02:00 |
|
|
Ghommie
|
843f43b4ad
|
Some autolathe issue.
|
2020-05-03 06:27:38 +02:00 |
|
|
Ghommie
|
2cbb659eb9
|
Implementing the NO_PUBLIC_LATHE build_type flag.
|
2020-05-03 06:15:40 +02:00 |
|
|
Ghommie
|
b2a20d5438
|
reducing some prices as training wheel.
|
2020-05-03 05:37:04 +02:00 |
|
|
kevinz000
|
8f29839dbf
|
Runechat Port (#12065)
* A
* A
* Ports Runechat
* compile fix
* fuck
* maybe?
* will this work?
* PLEASE
* fix
* fuck this
|
2020-05-03 03:53:19 +02:00 |
|
|
kevinz000
|
d4e6fada75
|
Update mirage_border.dm (#12092)
|
2020-05-03 03:50:38 +02:00 |
|
|
kevinz000
|
c1436c4c7b
|
Maptick lag minimization port (#12066)
* extools.dll
* backend
* queued pipenet builds
* oh yeah we don't have that
* wow
* Update air.dm
|
2020-05-03 03:34:33 +02:00 |
|
|
Ghommie
|
1cb83547fa
|
whops!
|
2020-05-03 03:23:00 +02:00 |
|
|
Ghommie
|
53c0ea391e
|
steam sales.
|
2020-05-03 02:54:13 +02:00 |
|
|
Ghommie
|
a194d7dafe
|
merge conflict and job/dept discounts support.
|
2020-05-03 02:11:05 +02:00 |
|
|
kevinz000
|
5bf7fd0030
|
Merge pull request #12087 from Ghommie/Ghommie-cit718
Fixing more issues.
|
2020-05-02 15:56:28 -07:00 |
|