 Lin
|
c4cb06f8f0
|
Merge pull request #10112 from Ghommie/Ghommie-cit447
Refactors that mess of a code for alternate worn clothing sprites for digitigrade and taurs.
|
2020-01-10 01:31:20 +00:00 |
|
|
Ghommie
|
825b4f01c2
|
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit490
|
2020-01-10 02:26:19 +01:00 |
|
|
Unknown
|
e008388176
|
Bee models
|
2020-01-09 16:13:23 -07:00 |
|
|
Unknown
|
8a8d0bf6da
|
Merge branch 'master' into xantholne-cowboy02
|
2020-01-08 20:36:22 -07:00 |
|
|
Unknown
|
afc0ca44f2
|
Merge branch 'master' into xantholne-cowboy02
|
2020-01-08 20:35:36 -07:00 |
|
|
Seris02
|
c7790aba1a
|
moves observe to ghost tab
|
2020-01-09 10:46:18 +08:00 |
|
|
Putnam
|
244d46ee41
|
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into arousal-bad
|
2020-01-08 17:08:01 -08:00 |
|
|
kevinz000
|
1e6d05dc59
|
Merge pull request #10470 from deathride58/deletesminers
[s] adds a cooldown to area creation attempts
|
2020-01-08 13:29:36 -08:00 |
|
|
Unknown
|
4773a3e374
|
Fuggin Cowboy Clothes
|
2020-01-08 07:15:42 -07:00 |
|
|
Putnam
|
12a04da2d2
|
Added second flavor text, not copied on save.
|
2020-01-08 00:57:42 -08:00 |
|
|
Putnam
|
cd35e516ac
|
back by popular demand: maso/nympho
|
2020-01-07 17:01:14 -08:00 |
|
|
Putnam3145
|
b09ef97ae3
|
Merge pull request #10305 from BlackMajor/Yeehaw
Various Mining borg changes. And some extras.
|
2020-01-07 16:50:21 -08:00 |
|
|
BlackMajor
|
05a644cc41
|
Revert "Merge branch 'master' into Yeehaw"
This reverts commit 972c03f79f, reversing
changes made to 8ebd698763.
|
2020-01-08 12:26:45 +13:00 |
|
|
BlackMajor
|
972c03f79f
|
Merge branch 'master' into Yeehaw
|
2020-01-08 12:25:50 +13:00 |
|
|
BlackMajor
|
b41c9cd844
|
Sync with master
|
2020-01-08 12:25:22 +13:00 |
|
|
kevinz000
|
5b2c4deaa0
|
lockcharge --> locked_down
|
2020-01-07 12:04:41 -08:00 |
|
|
kevinz000
|
e4cfb1fa39
|
more
|
2020-01-07 12:03:46 -08:00 |
|
|
kevinz000
|
2a304800df
|
more reformatting
|
2020-01-07 11:46:32 -08:00 |
|
|
deathride58
|
6f2cf0b636
|
[s] adds a cooldown to area creation attempts
|
2020-01-07 10:04:09 -05:00 |
|
|
kevinz000
|
5f7f1b09f3
|
Update observer.dm
|
2020-01-07 02:41:05 -08:00 |
|
|
kevinz000
|
ae73927b67
|
patches
|
2020-01-07 02:39:16 -08:00 |
|
|
kevinz000
|
8a29c5a7a9
|
Update mob_defines.dm
|
2020-01-07 02:20:44 -08:00 |
|
|
kevinz000
|
b9260a62df
|
Update observer.dm
|
2020-01-07 02:16:52 -08:00 |
|
|
kevinz000
|
5975f4c17d
|
Update observer.dm
|
2020-01-07 02:12:47 -08:00 |
|
|
kevinz000
|
d461e70a9b
|
Update life.dm
|
2020-01-06 23:45:39 -08:00 |
|
|
kevinz000
|
05c903e4a3
|
Update life.dm
|
2020-01-06 23:44:33 -08:00 |
|
|
kevinz000
|
3efdf013e6
|
mobility flags
|
2020-01-06 21:47:27 -08:00 |
|
|
BlackMajor
|
5a97259ba9
|
Fix a couple of bugs, add wrapping paper and destination tagger
|
2020-01-07 15:33:16 +13:00 |
|
|
Lin
|
2ce3b7fbf5
|
Merge pull request #10455 from Ghommie/Ghommie-cit501
Porting some runtime fixes.
|
2020-01-07 01:00:25 +00:00 |
|
|
Lin
|
46420a693d
|
Merge branch 'master' into Ghommie-cit425
|
2020-01-07 00:28:37 +00:00 |
|
|
kevinz000
|
7006f2b1be
|
more compile stuff
|
2020-01-06 04:23:52 -08:00 |
|
|
kevinz000
|
c77005af8a
|
changes
|
2020-01-06 04:17:53 -08:00 |
|
|
kevinz000
|
a8cc37eaf0
|
ok
|
2020-01-06 03:57:58 -08:00 |
|
|
kevinz000
|
7378d91684
|
([\W\.])Knockdown\(
|
2020-01-06 03:39:20 -08:00 |
|
|
Lin
|
7ad6021472
|
Merge pull request #10437 from Ghommie/Ghommie-cit497
Fixes roundstart mushpeople being unable to MUSH PUUUUUUUUUUUUNCH!!
|
2020-01-06 03:49:52 +00:00 |
|
|
Putnam
|
fba7a8abb0
|
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into arousal-bad
|
2020-01-05 19:12:28 -08:00 |
|
|
Putnam
|
d75a525b3c
|
let's fix arousal huh
|
2020-01-05 19:10:48 -08:00 |
|
|
Ghommie
|
dcb2ae77fa
|
Porting some runtime fixes.
|
2020-01-06 02:14:25 +01:00 |
|
|
kevinz000
|
1f2597784f
|
git commit death
|
2020-01-05 15:40:23 -08:00 |
|
|
Ghom
|
e18244671f
|
Merge pull request #10350 from Putnam3145/dojo-ghostrole
Ghost cafe quality-of-life, plus making ghost role eligibility an element
|
2020-01-05 23:05:13 +01:00 |
|
|
Ghommie
|
592422ee70
|
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit490
|
2020-01-05 22:53:00 +01:00 |
|
|
kevinz000
|
6e50bb9c03
|
Revert "Makes mob/Stat on a 1 second timer rather than fast-as-possible to tone down highpop lag"
|
2020-01-05 12:47:24 -08:00 |
|
|
Ghommie
|
8c7b648a4f
|
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit425
|
2020-01-05 17:42:54 +01:00 |
|
|
Ghom
|
59279a7cd4
|
Merge pull request #10433 from Citadel-Station-13/kevinz000-patch-7
nerfs pogscarabs
|
2020-01-05 16:23:37 +01:00 |
|
|
Ghom
|
0646a8557b
|
Merge pull request #10428 from Putnam3145/bomb_fix
Made dev bombs kill through bomb armor again
|
2020-01-05 15:33:54 +01:00 |
|
|
kevinz000
|
b4736febcf
|
uhh
|
2020-01-04 13:02:23 -08:00 |
|
|
Ghommie
|
356304f68f
|
Fixes roundstart mushpeople not having MUSH PUUUUUUUUUUUUNCH!!
|
2020-01-04 20:34:31 +01:00 |
|
|
Ghom
|
499907f9b7
|
Merge pull request #10191 from Citadel-Station-13/michael_labs
Custom Holoforms for pAIs and AIs oh and adds certain cyborg pai holograms. also mild pai nerf.
|
2020-01-04 14:07:25 +01:00 |
|
|
Ghommie
|
686a76dd1d
|
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit265
|
2020-01-04 13:35:05 +01:00 |
|
|
kevinz000
|
a930464f57
|
Update extra_drone_types.dm
|
2020-01-04 00:54:06 -08:00 |
|