Putnam3145
|
3cfaad31c1
|
Merge pull request #15149 from keronshb/dynamicport
(Probably ready for test merge) DYNAMIC 2021
|
2021-10-07 18:14:59 -07:00 |
|
keronshb
|
4e91dde6b0
|
Timer fix and dead list removal
|
2021-09-30 14:50:04 -04:00 |
|
keronshb
|
13323d2597
|
Merge branch 'master' into dynamicport
|
2021-09-19 17:59:09 -04:00 |
|
silicons
|
147903f654
|
sigh
|
2021-09-19 10:57:58 -07:00 |
|
keronshb
|
408517fb1d
|
SHOULD? FIX?
|
2021-09-16 20:53:46 -04:00 |
|
keronshb
|
7ed5f622f4
|
Dynamic
|
2021-09-14 19:33:17 -04:00 |
|
zerothebigboy
|
68e2eb1d7a
|
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into prisoners
|
2021-09-10 12:12:57 -04:00 |
|
silicons
|
69bd477a72
|
Merge pull request #15039 from keronshb/gradiantport
Ports Colorist Quirk and Hair Gradients Preferences
|
2021-09-08 20:41:00 -07:00 |
|
zerothebigboy
|
ccfde52b0d
|
code
|
2021-09-02 23:45:03 -04:00 |
|
silicons
|
d427c43b7b
|
Merge pull request #15032 from keronshb/itemhighlight
Ports Inventory Outlines
|
2021-08-26 21:41:25 -07:00 |
|
keronshb
|
47078e9a85
|
Ports Hair Gradiants
|
2021-08-26 11:58:09 -04:00 |
|
zeroisthebiggay
|
2bc55dad4f
|
Update maintenance_loot.dm
|
2021-08-26 01:48:10 -04:00 |
|
keronshb
|
7070a848b6
|
Item Highlight Port
|
2021-08-22 00:21:06 -04:00 |
|
timothyteakettle
|
65c40a51f2
|
trash ELEMENT
|
2021-07-14 17:17:44 +01:00 |
|
silicons
|
3c7786dafd
|
Merge pull request #14734 from keronshb/SpaceDragon
(READY) Ports Space Dragon Midround Event.
|
2021-06-18 20:03:43 -07:00 |
|
zerothebigboy
|
e757f9ea2c
|
thetwentythirdofmany
|
2021-06-12 17:41:09 -04:00 |
|
Linzolle
|
46833abf0b
|
add cult_permitted area flag
|
2021-05-27 19:34:00 -05:00 |
|
keronshb
|
d2f69acaf8
|
Space Dragon Event
Ports the Space Dragon event
|
2021-05-18 12:06:32 -04:00 |
|
Timothy Teakettle
|
23015f83c4
|
re-adds the newline
|
2021-05-08 21:04:27 +01:00 |
|
Timothy Teakettle
|
0bc90971ff
|
removes the newline
|
2021-05-08 21:04:01 +01:00 |
|
Timothy Teakettle
|
3c7137f951
|
what if we didnt break 90% of the game
|
2021-05-05 18:19:02 +01:00 |
|
Timothy Teakettle
|
ba71bb944a
|
im not crazy but this commit breaks 90% of the game
|
2021-05-05 18:11:05 +01:00 |
|
Timothy Teakettle
|
1664459b14
|
squash bugs
|
2021-05-05 15:26:56 +01:00 |
|
Timothy Teakettle
|
93254f5d9c
|
Merge remote-tracking branch 'upstream/master' into rp-markings-attempt-two
|
2021-05-02 22:20:57 +01:00 |
|
Timothy Teakettle
|
a6a3f99539
|
rp marking ui
|
2021-04-25 20:57:02 +01:00 |
|
silicons
|
0534f70ccd
|
Update bitfields.dm (#14645)
|
2021-04-24 21:29:53 +02:00 |
|
necromanceranne
|
75e0e893a2
|
Merge branch 'master' into baton_change_pr
|
2021-04-19 10:55:33 +10:00 |
|
Letter N
|
88ba15d748
|
Update bitfields.dm
|
2021-04-16 21:34:07 +08:00 |
|
LetterN
|
f976a89157
|
Merge remote-tracking branch 'origin/master' into perlin-genny
|
2021-03-31 08:19:31 +08:00 |
|
necromanceranne
|
79de55c58c
|
First part of the largescale shield cleanup, including ensuring shields respect their various counters and strengths appropriately.
|
2021-03-25 09:07:52 +11:00 |
|
LetterN
|
292f67e098
|
Merge remote-tracking branch 'origin/master' into perlin-genny
|
2021-03-20 20:36:56 +08:00 |
|
DeltaFire
|
b105a3c831
|
Merge pull request #14347 from timothyteakettle/language-tab
the speech panel pr
|
2021-03-16 20:31:58 +01:00 |
|
necromanceranne
|
6ebc911937
|
Batons knockdown and slowdown on rightclick, otherwise they stagger, but always do damage. Damage respects melee armor, but power cells grant armor pen based on max charge.
|
2021-03-16 04:48:55 +11:00 |
|
Letter N
|
935e46b492
|
The Mapping Update
Cleans up the map (again)
Makes mining code more better
|
2021-03-12 12:11:35 +08:00 |
|
Letter N
|
59a725c25a
|
icon(s) fixes and fixes boards
|
2021-03-10 11:26:33 +08:00 |
|
Letter N
|
754c24748e
|
Merge remote-tracking branch 'origin/master' into hardsync-1.5
|
2021-03-03 17:09:01 +08:00 |
|
Timothy Teakettle
|
329e8e7d38
|
Merge branch 'master' into language-tab
|
2021-03-01 20:49:16 +00:00 |
|
silicons
|
fd497b3297
|
Update traits.dm
|
2021-02-24 01:23:06 -07:00 |
|
silicons
|
94cc70f7b9
|
Update traits.dm
|
2021-02-24 01:21:00 -07:00 |
|
Letter N
|
2be4c76add
|
THIS FIXES IT (well it should :) )
|
2021-02-22 21:05:07 +08:00 |
|
Letter N
|
501d33cddd
|
agony
|
2021-02-19 10:32:24 +08:00 |
|
Letter N
|
5db87b9065
|
more updates!
|
2021-02-12 17:52:59 +08:00 |
|
Letter N
|
f87aa0ac5b
|
toast. And DiscoFox™️
|
2021-02-08 18:46:05 +08:00 |
|
Timothy Teakettle
|
a7445316ef
|
Update flavor_misc.dm
|
2021-01-28 02:11:08 +00:00 |
|
Timothy Teakettle
|
337611a372
|
Merge remote-tracking branch 'upstream/master' into caw-and-gekker
|
2021-01-28 02:10:11 +00:00 |
|
Timothy Teakettle
|
e130e9c7e2
|
Update flavor_misc.dm
|
2021-01-28 02:08:19 +00:00 |
|
Artur
|
66979e2364
|
Merge branch 'master' into revenant_TK
|
2021-01-20 18:27:11 +02:00 |
|
silicons
|
dedb0cb62e
|
Merge remote-tracking branch 'citadel/master' into tgsync
|
2021-01-19 04:24:42 -07:00 |
|
The0bserver
|
ffe401544c
|
First wave of fixing
|
2021-01-13 23:35:37 -05:00 |
|
Artur
|
2f619ffc4e
|
Traits
|
2021-01-13 10:27:10 +02:00 |
|