Ghommie
|
874cdfefb8
|
fixing storage implant transplant.
|
2019-11-02 14:03:14 +01:00 |
|
kevinz000
|
be752c1fb0
|
Merge pull request #9531 from Ghommie/Ghommie-cit246
Little stunbaton nerf (split off from #9500)
|
2019-10-29 21:43:45 -07:00 |
|
kevinz000
|
6dc6159f4a
|
Merge pull request #9578 from deathride58/mapsubsystemimprovements
Map config system improvements - Fixed and expanded map vote restrictions, map-specific announcer framework, and more
|
2019-10-29 21:42:32 -07:00 |
|
kevinz000
|
a7039c2d89
|
Merge pull request #9500 from Ghommie/Ghommie-cit237
teleprods works on non-carbons too now.
|
2019-10-29 21:37:41 -07:00 |
|
kevinz000
|
b172c5f691
|
Merge pull request #9501 from deathride58/stronksecborgs
Borg buffs - Allows jaws to incapacitate, gives secborg a taser, and more! (wall of text in desc)
|
2019-10-29 21:29:12 -07:00 |
|
kevinz000
|
ae4aee794e
|
Merge pull request #9592 from Ghommie/Ghommie-cit262
Porting movespeed modification system updates.
|
2019-10-29 21:27:53 -07:00 |
|
kevinz000
|
0064529362
|
Merge pull request #9610 from Ghommie/Ghommie-cit273
ports anti-magic component code updates (holymelon sold separately).
|
2019-10-29 21:26:03 -07:00 |
|
kevinz000
|
2ca3cedaed
|
Merge pull request #9648 from Ghommie/Ghommie-cit288
Random plush spawner tweaks and fixes.
|
2019-10-29 21:22:46 -07:00 |
|
kevinz000
|
0fb5687a0a
|
Update RCD.dm
|
2019-10-29 16:53:15 -07:00 |
|
kevinz000
|
0746d782d7
|
Update RCD.dm
|
2019-10-29 16:43:59 -07:00 |
|
kevinz000
|
39030b8fb0
|
Update RCD.dm
|
2019-10-29 16:37:36 -07:00 |
|
Ghommie
|
f725afae64
|
Random plush spawner tweaks and fixes.
|
2019-10-29 02:06:22 +01:00 |
|
kevinz000
|
d7e8b5209f
|
Update bags.dm
|
2019-10-27 20:36:32 -07:00 |
|
Ghommie
|
80cd4902ca
|
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit273
|
2019-10-28 00:49:22 +01:00 |
|
kevinz000
|
dabfba8a0d
|
Merge pull request #9619 from BlackMajor/Yote
Buffs engiborg build potential
|
2019-10-27 05:38:50 -07:00 |
|
BlackMajor
|
1b2d1c1423
|
Whoops again
|
2019-10-27 02:04:46 +13:00 |
|
BlackMajor
|
90d28b7202
|
whoops
|
2019-10-26 23:00:12 +13:00 |
|
BlackMajor
|
f3cbd43d8b
|
What if engiborgs could actually build machines
|
2019-10-26 22:58:28 +13:00 |
|
kevinz000
|
49e52eee05
|
Merge pull request #9603 from Ghommie/Ghommie-cit267
Unmodularize lavaknights and emags.
|
2019-10-25 20:12:35 -07:00 |
|
Ghommie
|
cb74be29ae
|
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit262
|
2019-10-25 12:40:50 +02:00 |
|
Ghommie
|
c1f84da39e
|
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit272
|
2019-10-25 12:26:17 +02:00 |
|
kevinz000
|
9096f03ad3
|
Merge pull request #8654 from Ghommie/Ghommie-cit54
ports in the Hilbert's Hotel.
|
2019-10-24 19:07:33 -07:00 |
|
kevinz000
|
da502aa31d
|
Merge pull request #9535 from Ghommie/Ghommie-cit247
Fixing sniper rifles scope datum action oddity.
|
2019-10-24 19:05:25 -07:00 |
|
kevinz000
|
2ae111eaf0
|
Merge pull request #9587 from Ghommie/Ghommie-cit258
Porting components updates and fixing phantom thief component.
|
2019-10-24 18:38:39 -07:00 |
|
Ghommie
|
a62fcdcccb
|
forgot about the file extension.
|
2019-10-25 03:34:13 +02:00 |
|
Ghommie
|
ad7101d0aa
|
ports anti-magic component code updates (holymelon not included).
|
2019-10-25 03:20:42 +02:00 |
|
Ghommie
|
4b0b130c36
|
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit272
|
2019-10-25 00:27:04 +02:00 |
|
Ghommie
|
85b35433b2
|
Unmodularize Eutactic Blades.
|
2019-10-25 00:14:38 +02:00 |
|
Ghommie
|
29584aff69
|
emagged travis now succeeds.
|
2019-10-24 23:11:18 +02:00 |
|
Ghommie
|
f01b5c853f
|
Unmodularize lavaknights.
|
2019-10-24 22:08:36 +02:00 |
|
Ghommie
|
a50606bb67
|
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit259
|
2019-10-24 10:10:07 +02:00 |
|
Ghommie
|
4c8d7023c5
|
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit258
|
2019-10-24 09:50:20 +02:00 |
|
deathride58
|
f85f110baa
|
Merge pull request #9047 from Poojawa/syntheticbloods
RGB Blood Reworks + Blood generator
|
2019-10-23 20:54:55 -04:00 |
|
Ghommie
|
a95b13c24a
|
jetpack fixes too & co
|
2019-10-23 19:31:54 +02:00 |
|
Ghommie
|
c882c098cc
|
Porting movespeed modification system updates.
|
2019-10-23 19:24:34 +02:00 |
|
Ghommie
|
e1928a18f1
|
Porting GetComponent macros removal, and some related changes.
|
2019-10-23 15:04:28 +02:00 |
|
Ghommie
|
ba307b01a5
|
Defib fixes and chem effects stuff
|
2019-10-23 13:45:57 +02:00 |
|
Ghommie
|
fc1f10c97f
|
Porting components updates and fixing phantom thief component.
|
2019-10-23 13:01:31 +02:00 |
|
kevinz000
|
e226a79c9b
|
Merge pull request #9198 from Trilbyspaceclone/A_Tailer's_art
Code stuffs + more framework for cargo rework cuz atomic prs are good
|
2019-10-22 23:11:56 -07:00 |
|
deathride58
|
68813b6846
|
Map config improvements - Adds more variables for the map voting system to take into account, allows far greater flexibility for mappers, adds a random chance for the medibot voice to be the station announcer
|
2019-10-22 19:14:12 -04:00 |
|
nik707
|
9a598a92cb
|
Merge pull request #9561 from Ghommie/Ghommie-cit256
Fixing some ayy overlays and client images oddities.
|
2019-10-22 16:49:07 -05:00 |
|
nik707
|
fc56fd9f8b
|
Merge pull request #9565 from Citadel-Station-13/kevinz000-patch-103
Fixes and nerfs VTEC upgrades
|
2019-10-22 16:48:10 -05:00 |
|
Poojawa
|
7463bbc001
|
Merge branch 'master' into syntheticbloods
|
2019-10-21 21:06:18 -05:00 |
|
deathride58
|
2742c86723
|
Merge pull request #9072 from Poojawa/gen-poppers
Genpop for security
|
2019-10-21 21:15:01 -04:00 |
|
Trilbyspaceclone
|
b4b875bf26
|
Merge branch 'master' into A_Tailer's_art
|
2019-10-21 21:06:21 -04:00 |
|
Poojawa
|
6fc750dca0
|
Merge remote-tracking branch 'refs/remotes/Citadel-Station-13/master' into syntheticbloods
|
2019-10-21 19:13:19 -05:00 |
|
BlackMajor
|
b77a94bd7d
|
Merge pull request #9370 from Citadel-Station-13/kevinz000-patch-88
buffs c4 on mobs
|
2019-10-22 11:04:30 +13:00 |
|
kevinz000
|
c0d4d32dee
|
Update robot_upgrades.dm
|
2019-10-21 14:36:21 -07:00 |
|
Ghommie
|
760522cf6a
|
Fixing some ayy overlays and client images oddities.
|
2019-10-21 11:29:43 +02:00 |
|
Ghommie
|
e991328087
|
progress
|
2019-10-19 15:02:56 +02:00 |
|