f1ca283318
Merge branch 'master' into familyport
2022-02-11 14:04:57 -05: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
41013ec815
Part 2 - Missing stuff from original families port
2021-10-12 12:07:02 -04:00
fce4eb0476
Merge branch 'dynamicport'
2021-10-09 00:28:30 -04:00
3cfaad31c1
Merge pull request #15149 from keronshb/dynamicport
...
(Probably ready for test merge) DYNAMIC 2021
2021-10-07 18:14:59 -07:00
4e91dde6b0
Timer fix and dead list removal
2021-09-30 14:50:04 -04:00
13323d2597
Merge branch 'master' into dynamicport
2021-09-19 17:59:09 -04:00
147903f654
sigh
2021-09-19 10:57:58 -07:00
7ed5f622f4
Dynamic
2021-09-14 19:33:17 -04:00
68e2eb1d7a
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into prisoners
2021-09-10 12:12:57 -04:00
69bd477a72
Merge pull request #15039 from keronshb/gradiantport
...
Ports Colorist Quirk and Hair Gradients Preferences
2021-09-08 20:41:00 -07:00
ccfde52b0d
code
2021-09-02 23:45:03 -04:00
47078e9a85
Ports Hair Gradiants
2021-08-26 11:58:09 -04:00
2bc55dad4f
Update maintenance_loot.dm
2021-08-26 01:48:10 -04:00
65c40a51f2
trash ELEMENT
2021-07-14 17:17:44 +01:00
e757f9ea2c
thetwentythirdofmany
2021-06-12 17:41:09 -04:00
23015f83c4
re-adds the newline
2021-05-08 21:04:27 +01:00
0bc90971ff
removes the newline
2021-05-08 21:04:01 +01:00
3c7137f951
what if we didnt break 90% of the game
2021-05-05 18:19:02 +01:00
ba71bb944a
im not crazy but this commit breaks 90% of the game
2021-05-05 18:11:05 +01:00
1664459b14
squash bugs
2021-05-05 15:26:56 +01:00
a6a3f99539
rp marking ui
2021-04-25 20:57:02 +01:00
292f67e098
Merge remote-tracking branch 'origin/master' into perlin-genny
2021-03-20 20:36:56 +08:00
b105a3c831
Merge pull request #14347 from timothyteakettle/language-tab
...
the speech panel pr
2021-03-16 20:31:58 +01:00
935e46b492
The Mapping Update
...
Cleans up the map (again)
Makes mining code more better
2021-03-12 12:11:35 +08:00
59a725c25a
icon(s) fixes and fixes boards
2021-03-10 11:26:33 +08:00
329e8e7d38
Merge branch 'master' into language-tab
2021-03-01 20:49:16 +00:00
2be4c76add
THIS FIXES IT (well it should :) )
2021-02-22 21:05:07 +08:00
501d33cddd
agony
2021-02-19 10:32:24 +08:00
5db87b9065
more updates!
2021-02-12 17:52:59 +08:00
f87aa0ac5b
toast. And DiscoFox ™️
2021-02-08 18:46:05 +08:00
a7445316ef
Update flavor_misc.dm
2021-01-28 02:11:08 +00:00
337611a372
Merge remote-tracking branch 'upstream/master' into caw-and-gekker
2021-01-28 02:10:11 +00:00
e130e9c7e2
Update flavor_misc.dm
2021-01-28 02:08:19 +00:00
ffe401544c
First wave of fixing
2021-01-13 23:35:37 -05:00
98f8af853c
Minor xenohybrid changeschanges
...
Adds wings, xeno tongue, and makes xenomorphs speak xenohybrid by default
2021-01-06 01:58:58 -08:00
c3e9cdd9a5
finale
2020-12-26 23:09:19 +00:00
803bff4e5f
funny
2020-11-12 23:34:42 -07:00
3224533a7c
Merge branch 'master' into spooder
2020-10-11 14:31:23 -05:00
7f611a98e1
Merge remote-tracking branch 'citadel/master' into combat_rework_experimental
2020-10-10 22:23:22 -07:00
737b6460af
Merge pull request #13497 from Zandario/species-refactor
...
Refactors some defines for easier Species Development
2020-10-10 22:00:49 -07:00
385bd57940
reworks family heirlooms, adds heirlooms that can be based off your species ( #13444 )
...
* corgi tracker
* better heirloom system
* typo
2020-10-10 12:15:39 +02:00
1b1efce556
Merge remote-tracking branch 'citadel/master' into combat_rework_experimental
2020-10-06 17:11:21 -07:00
9fb18f8b9f
language tab
2020-10-06 22:34:17 +01:00
05aef528d7
finishing touches
2020-10-04 17:33:46 +01:00
b48f4b91e6
Merge branch 'master' into eye-sprites
2020-10-04 01:23:03 +01:00
dc70d17a1e
customizable eyes
2020-10-04 01:19:29 +01:00
0c99b53c05
eyes
2020-10-03 23:22:53 +01:00
1620e3887c
Merge branch 'master' into species-refactor
2020-10-02 17:19:48 -05:00
bdd121cd81
Prep Work
2020-10-02 17:17:50 -05:00
keronshb