Timothy Teakettle
f5300750b5
Revert "[TESTMERGE ONLY] FUCK"
2020-08-17 03:18:36 +01:00
silicons
4cd731ce11
Revert "cease your shitcode: cum edition"
2020-08-16 19:06:57 -07:00
timothyteakettle
1f240b883f
holy shit
2020-08-11 03:37:04 +01:00
Putnam
9bb3ba5c5a
added ethereals
2020-08-08 00:08:43 -07:00
silicons
03f0d76a8e
yeah ok
2020-07-23 13:23:45 -07:00
Detective Google
da68163c80
ghosts now appear at round-end
2020-06-22 15:43:32 -05:00
Lin
bfe8ccdfb5
Merge pull request #11627 from kevinz000/combat_rework
...
"Unofficial" Combat Rework Part 3: Blocking/Parrying
2020-06-12 16:39:11 -05:00
Yawet330
fabfd684ce
Silicon Flavortexts. (SCRUTINISE HEAVILY) ( #12395 )
...
* Part 1 - Adding the component
* Part 2 - Making the WRITE_FILE before changing the pref menu.
* Part 3 - Mirroring existing code, instead of tacking it on because im both lazy, and want a distinction
* Part 4 - Changes the preference tab to accomodate this.
* we made a brief fucky wucky!
* make it look noice
* fuckywucky mk2
* Part 5 - make it apart of the helper list (woops)
* that'yll do it.
* maybe fix?
* nope, just hit the delete button on their flavortext entirely :agony:
* Update preferences_savefile.dm
* Update silicon.dm
* Update preferences.dm
* Update silicon.dm
2020-06-04 15:53:39 -07:00
kevinz000
05068f80db
Merge remote-tracking branch 'citadel/master' into combat_rework
2020-05-07 10:57:10 -07:00
kevinz000
f034c7c536
Merge remote-tracking branch 'citadel/master' into combat_rework
2020-05-05 17:38:43 -07:00
Ghommie
ccfce7cb64
Makes wings/horns colors dna features instead of human defines
2020-05-05 06:22:58 +02:00
Ghommie
42d7d57ad6
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit698
2020-05-02 19:17:48 +02:00
kevinz000
d9b6ea5181
Merge pull request #11847 from Ghommie/Ghommie-cit679
...
A peeve with random bodies.
2020-04-25 16:59:07 -07:00
Ghommie
e9bf432a0d
Scavenging element.
2020-04-22 03:30:40 +02:00
Ghommie
c774f18758
.
2020-04-14 19:18:08 +02:00
Ghommie
571584901c
Custom skin tone preferences.
2020-04-14 19:10:28 +02:00
Ghom
55402b1834
Merge branch 'master' into Ghommie-cit679
2020-04-14 16:22:00 +02:00
Ghom
a57828703e
Update mobs.dm
2020-04-14 16:09:31 +02:00
Ghommie
e753c1ad14
Fixed a little peeve with random bodies.
2020-04-14 02:20:19 +02:00
Ghommie
fe4b270568
Sprite size preferences?! Oh no!
2020-04-12 05:08:49 +02:00
kevinz000
234687c5c8
do_after_advanced
2020-04-11 05:10:07 -07:00
Artur
65ec9f3723
Merge remote-tracking branch 'Citadel-Station-13/master' into skateboards_cool_again
2020-04-01 13:03:06 +03:00
Artur
4de14fbdf7
Finnishing touches
2020-04-01 12:59:06 +03:00
Artur
f40f07b033
[READY]Skateboard overhaul ( #45657 )
...
* skeet skeet
* scoot
* removes debug message
* merge conflict
* oopsie
* polish, new board types
* begone
* actioninja review
* passtable trait
* fixes indent
* dwarfism check
* check for existing flag
* check existing trait
* screwdriver returns FALSE
2020-04-01 12:05:27 +03:00
Ghommie
e26b43d80b
The banishment of the floating disembodied phallus.
2020-03-31 02:40:28 +02:00
Ghommie
c9f02d97a1
Privates Visibility Preferences. Also Undergarments having a purpose.
2020-03-25 02:47:16 +01:00
kevinz000
3990b1f4c9
Merge pull request #11571 from Ghommie/Ghommie-cit635
...
Size preferences made configurable.
2020-03-23 10:37:54 -07:00
Ghommie
76ff0d4931
M/F body preferences.
2020-03-22 19:47:48 +01:00
Ghommie
6d4433dd77
Size preferences made configurable.
2020-03-22 01:07:51 +01:00
Ghommie
6c6b2a42eb
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit629
2020-03-21 15:04:35 +01:00
Ghommie
eeab3ed11f
Everyday
2020-03-19 17:34:01 +01:00
Ghommie
dd7046cbd1
no comment
2020-03-19 16:53:58 +01:00
Ghommie
bd9e195b11
shapes and sizes sanitized.
2020-03-19 16:41:19 +01:00
Ghom
8878733fc1
Merge pull request #11317 from deathride58/WEPORTINSYNTHSBOI
...
Ports Skyrat's synths (Plus limb rendering overhaul and more)
2020-03-09 00:26:06 +01:00
deathride58
2e35c09dec
Merge pull request #10451 from kevinz000/mobility_flags
...
Mobility flags + combat rework stuff refactoring, fixes a few edge cases including the Oh Dreaded Xenomorph Hardstuns, etc etc time to break the game
2020-03-05 20:03:56 -05:00
deathride58
49ad376e5e
Adds a very basic soft restriction system. There's definite room for improvement, but this is good enough for now. Am too hongry for this.
2020-03-03 17:44:10 -05:00
Detective-Google
1f88a22d04
Merge branch 'master' into big-chode-energy
2020-02-27 16:39:57 -06:00
Detective Google
b7aad30d3c
girth -> diameter
2020-02-27 16:38:14 -06:00
kevinz000
0e4692c63d
Merge remote-tracking branch 'citadel/master' into mobility_flags
2020-02-18 18:16:34 -07:00
kevinz000
eca0e0f2dc
Merge remote-tracking branch 'citadel/master' into mobility_flags
2020-02-13 00:39:20 -07:00
Ghommie
c34714cb90
Something about the in operator and spaceDMM version update.
2020-02-10 07:37:59 +01:00
Ghommie
26d8d9387a
ok
2020-02-04 05:06:59 +01:00
kevinz000
7bcb37c5d1
Merge remote-tracking branch 'citadel/master' into mobility_flags
2020-01-16 21:12:56 -07:00
kevinz000
2ba226b912
aa
2020-01-16 20:57:02 -07:00
kevinz000
b505c1e087
WEH
2020-01-16 19:22:47 -07:00
kevinz000
14aaca8fa5
compile
2020-01-16 19:18:54 -07:00
kevinz000
1acac87da3
compile
2020-01-15 23:54:30 -07:00
AffectedArc07
16a37e2769
Standardises all files from CRLF to LF
2020-01-12 14:28:01 +00:00
nik707
8a4e44758f
Merge pull request #10165 from Ghommie/Ghommie-cit456
...
Minor underwear fixes and tweaks.
2019-12-30 18:28:48 -06:00
shellspeed1
1875ea3f58
new wings and fluff
2019-12-21 23:47:41 -08:00
