Poojawa
|
4fdddc7b4d
|
clears a merge conflict
|
2019-10-17 05:37:44 -05:00 |
|
Poojawa
|
184e81eec0
|
Merge remote-tracking branch 'refs/remotes/Citadel-Station-13/master' into syntheticbloods
|
2019-10-16 01:51:51 -05:00 |
|
kevinz000
|
7187da9e72
|
Merge pull request #9456 from Thalpy/Spookytime
[READY] [Spookytime] Adds Jacqueline the Pumpqueen
|
2019-10-15 23:11:35 -07:00 |
|
kevinz000
|
6d1035e995
|
Merge pull request #9491 from Poojawa/wingfix
Fixes missing decorative wing states
|
2019-10-15 22:59:45 -07:00 |
|
deathride58
|
df17f34eb6
|
Merge pull request #9488 from Ghommie/Ghommie-cit231
Adds some missing species_traits for cloth, clockwork and cult golems.
|
2019-10-15 06:20:43 -04:00 |
|
deathride58
|
ffa7898f45
|
Merge pull request #9478 from Putnam3145/podfatfix
Makes pod people not constantly slightly fat
|
2019-10-15 06:19:26 -04:00 |
|
deathride58
|
6245d5df30
|
Merge pull request #9471 from Citadel-Station-13/exploits
[s] fixes some exploits
|
2019-10-14 14:16:46 -04:00 |
|
Poojawa
|
bcb11a471d
|
Merge remote-tracking branch 'refs/remotes/Citadel-Station-13/master' into syntheticbloods
|
2019-10-13 19:14:16 -05:00 |
|
Poojawa
|
fad517fccb
|
oh let's unsnowflake this one too I guess
|
2019-10-13 19:06:46 -05:00 |
|
Poojawa
|
198f2b7add
|
Fixes missing decorative wing states
|
2019-10-13 19:02:28 -05:00 |
|
Thalpy
|
e7c5e74d3a
|
Hopefully no break
|
2019-10-13 23:41:06 +01:00 |
|
Ghommie
|
ff3972247a
|
Fixes some missing species_traits for cloth, clockwork and cult golems.
|
2019-10-13 23:40:52 +02:00 |
|
kevinz000
|
48e4187cef
|
Merge pull request #9461 from r4d6/master
Adding Decorative Wings
|
2019-10-13 14:00:07 -07:00 |
|
kevinz000
|
3d9f012cdb
|
Merge pull request #9464 from JTGSZ/speciesrestrictions2
Re-adds latejoin menu qualifies for rank proc restrictions. Try number 2
|
2019-10-13 13:55:21 -07:00 |
|
Putnam
|
1b97c50ef7
|
Makes pod people not constantly slightly fat
|
2019-10-12 17:50:51 -07:00 |
|
Poojawa
|
394c947d14
|
Merge remote-tracking branch 'refs/remotes/Citadel-Station-13/master' into syntheticbloods
|
2019-10-11 23:10:45 -05:00 |
|
kevinz000
|
076b2d48fc
|
Update secbot.dm
|
2019-10-11 20:46:19 -07:00 |
|
kevinz000
|
8c07a79700
|
Update bot.dm
|
2019-10-11 20:45:42 -07:00 |
|
kevinz000
|
f393c7fff2
|
Update new_player.dm
|
2019-10-11 20:43:10 -07:00 |
|
Fermi
|
7bce68bb11
|
Merge branch 'master' into Spookytime
|
2019-10-11 21:51:48 +01:00 |
|
kevinz000
|
e717272129
|
Merge pull request #9450 from JTGSZ/offsets4stuff
Adds more control over species based offsets
|
2019-10-11 12:13:19 -07:00 |
|
kevinz000
|
0643a7b230
|
Merge pull request #9387 from Sishen1542/goose
the geese have been unleased
|
2019-10-11 12:11:50 -07:00 |
|
kevinz000
|
b0b274762c
|
Merge pull request #9441 from lolman360/whydowehave1000branches
Ports /tg/ advanced surgerytools and tool defines.
|
2019-10-11 12:10:31 -07:00 |
|
kevinz000
|
9cd75c82a4
|
Merge pull request #9435 from Linzolle/firefix
fix fireman carry offhand not automatically deleting itself
|
2019-10-11 12:09:14 -07:00 |
|
kevinz000
|
4ab08802a1
|
Merge pull request #9442 from YakumoChen/air-hog
Reverts jetpack efficiency from #9307
|
2019-10-11 12:08:44 -07:00 |
|
kevinz000
|
1896b43c79
|
Merge pull request #9451 from Ghommie/Ghommie-cit224
standarizes mobs' can_equip arguments.
|
2019-10-11 12:05:12 -07:00 |
|
Fermi
|
cd47412db2
|
Merge branch 'master' into Spookytime
|
2019-10-11 19:10:48 +01:00 |
|
Sishen
|
c51bfc153b
|
b
|
2019-10-11 13:24:00 -04:00 |
|
r4d6
|
3e7131c7f6
|
Update wings.dm
|
2019-10-11 05:43:55 -04:00 |
|
YakumoChen
|
55e7645773
|
updating branch
|
2019-10-11 04:55:57 -04:00 |
|
JTGSZ
|
988a943f01
|
Try number 2
|
2019-10-11 02:36:10 -04:00 |
|
r4d6
|
1b08c541e2
|
Update wings.dm
|
2019-10-10 21:11:48 -04:00 |
|
r4d6
|
6b2a68f77a
|
Update code/modules/mob/living/carbon/human/species_types/furrypeople.dm
Co-Authored-By: Poojawa <Poojawa@users.noreply.github.com>
|
2019-10-10 21:09:28 -04:00 |
|
r4d6
|
e85e499504
|
I forgot a part.
Copy-pasted the Angel's wings' bit of code to have something to show.
|
2019-10-10 20:45:38 -04:00 |
|
r4d6
|
2d84b541cf
|
Update wings.dm
|
2019-10-10 20:32:15 -04:00 |
|
r4d6
|
0d5770f986
|
Update species.dm
|
2019-10-10 20:32:12 -04:00 |
|
r4d6
|
e83460853c
|
Update furrypeople.dm
|
2019-10-10 20:32:09 -04:00 |
|
kevinz000
|
3e6415d4b5
|
Merge pull request #9324 from Linzolle/crusher
Ports "Adds toggleable light and blinking charging light to crusher" and "Lets the kinetic crusher be one-hand carried"
|
2019-10-10 02:23:15 -07:00 |
|
kevinz000
|
c4f8956985
|
Merge pull request #9433 from Poojawa/hoss-tails
Corrects a missing tail state
|
2019-10-10 02:10:31 -07:00 |
|
kevinz000
|
f686ea75d3
|
Merge pull request #8615 from Ghommie/Ghommie-cit45
Virtual reality componentization.
|
2019-10-10 02:09:51 -07:00 |
|
kevinz000
|
0c9a065096
|
Merge pull request #8401 from Ghommie/Ghommie-cit11
Refactoring Implants' loc n°3
|
2019-10-10 02:09:37 -07:00 |
|
Ghommie
|
2ac24b2ac6
|
Fixing head rev blebs
|
2019-10-09 18:18:49 +02:00 |
|
Fermi
|
c4ac815598
|
Oof
|
2019-10-09 16:35:20 +01:00 |
|
Fermi
|
b34f648e60
|
Adds landmarks.
|
2019-10-09 13:57:19 +01:00 |
|
Ghommie
|
735755019e
|
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit45
|
2019-10-09 01:18:30 +02:00 |
|
Ghommie
|
9c3e532be7
|
Fixes lack of arguments on mobs' can_equip.
|
2019-10-09 00:21:55 +02:00 |
|
JTGSZ
|
2cd7f8f8ce
|
More control over species based offsets
|
2019-10-08 17:03:51 -04:00 |
|
Poojawa
|
cbefe95ade
|
Merge remote-tracking branch 'refs/remotes/Citadel-Station-13/master' into hoss-tails
|
2019-10-08 13:50:29 -05:00 |
|
YakumoChen
|
6faa0ee6e9
|
reverts jetpack efficiency
|
2019-10-08 09:03:12 +00:00 |
|
Poojawa
|
d7ab97dffc
|
does some of the television's demands
|
2019-10-08 04:02:20 -05:00 |
|