Commit Graph

24248 Commits

Author SHA1 Message Date
r4d6 8b1e140fa0 Update code/__HELPERS/mobs.dm
Co-Authored-By: Poojawa <Poojawa@users.noreply.github.com>
2019-10-10 21:09:14 -04:00
r4d6 618f8f30c5 Update code/__HELPERS/global_lists.dm
Co-Authored-By: Poojawa <Poojawa@users.noreply.github.com>
2019-10-10 21:09:09 -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 2822f43720 Update global_lists.dm 2019-10-10 20:32:25 -04:00
r4d6 05fa19c856 Update mobs.dm 2019-10-10 20:32:24 -04:00
r4d6 fef7dd4ac5 Update flavor_misc.dm 2019-10-10 20:32:22 -04:00
r4d6 fb715ed955 Update create_mob.dm 2019-10-10 20:32:20 -04:00
r4d6 a61fed2a73 Update preferences.dm 2019-10-10 20:32:19 -04:00
r4d6 ce81e657b5 Update preferences_savefile.dm 2019-10-10 20:32:17 -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
deathride58 ae843435f0 Merge pull request #9460 from Ghommie/Ghommie-cit230
quickfixes lowpop nuclear war tc malus calculation.
2019-10-10 15:20:20 -04:00
Ghommie e734b36ee3 quickfixes lowpop nuclear war tc malus calculation. 2019-10-10 20:54:19 +02:00
CitadelStationBot 1d2b935104 Automatic changelog generation for PR #9324 [ci skip] 2019-10-10 04:23:17 -05: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
CitadelStationBot aece7b8840 Automatic changelog generation for PR #9412 [ci skip] 2019-10-10 04:21:34 -05:00
kevinz000 0f74a735cb Merge pull request #9412 from Ghommie/Ghommie-cit213
Ports "Makes supermatter melt walls if it finds itself in one"
2019-10-10 02:21:32 -07:00
kevinz000 d9ff4235eb Merge pull request #9447 from Ghommie/Ghommie-cit223
No digitigrade plasmaman suits sprites for the time being, thank you.
2019-10-10 02:20:45 -07:00
CitadelStationBot 97e7435425 Automatic changelog generation for PR #9257 [ci skip] 2019-10-10 04:19:20 -05:00
kevinz000 fda64df569 Merge pull request #9257 from Thalpy/Blind-quirk-without-anger
[READY] Blind quirk without anger
2019-10-10 02:19:17 -07:00
CitadelStationBot 59ba51d865 Automatic changelog generation for PR #9368 [ci skip] 2019-10-10 04:18:27 -05:00
kevinz000 89747a3a6e Merge pull request #9368 from Seris02/master
Fixes luminescent dark blue major effect and changes the "autoprocess" button to "autoclone"
2019-10-10 02:18:25 -07:00
CitadelStationBot 1bbc837b9a Automatic changelog generation for PR #9415 [ci skip] 2019-10-10 04:13:27 -05:00
kevinz000 6e029c3360 Merge pull request #9415 from Ghommie/Ghommie-cit214
Removes the minimum player cap for the war ops in favour or a more proportional telecrystal bonus.
2019-10-10 02:13:25 -07:00
CitadelStationBot 3e1e6a18d0 Automatic changelog generation for PR #9439 [ci skip] 2019-10-10 04:12:57 -05:00
kevinz000 b233d3556e Merge pull request #9439 from JTGSZ/dominatorfix
Fixes Dominator countdown continuing after BoH movement, tweaks view amount
2019-10-10 02:12:55 -07:00
CitadelStationBot 70983ac6e4 Automatic changelog generation for PR #9432 [ci skip] 2019-10-10 04:12:43 -05:00
kevinz000 fb028b7997 Merge pull request #9432 from Putnam3145/pandemic-qol
Made PanD.E.M.I.C beaker stuff more like ChemMaster
2019-10-10 02:12:41 -07:00
CitadelStationBot b9e688f615 Automatic changelog generation for PR #9446 [ci skip] 2019-10-10 04:11:19 -05:00
kevinz000 f791b399a0 Merge pull request #9446 from Sishen1542/ung
abscond can no longer be cast from inside a locker
2019-10-10 02:11:17 -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
CitadelStationBot fbf6dce1b4 Automatic changelog generation for PR #9452 [ci skip] 2019-10-10 04:10:10 -05:00
kevinz000 236dcc4d63 Merge pull request #9452 from Ghommie/Ghommie-cit225
Stops non-alphanumeric graffiti decals from being named "letter".
2019-10-10 02:10:08 -07:00
CitadelStationBot cbbbc13861 Automatic changelog generation for PR #8615 [ci skip] 2019-10-10 04:09:54 -05:00
kevinz000 f686ea75d3 Merge pull request #8615 from Ghommie/Ghommie-cit45
Virtual reality componentization.
2019-10-10 02:09:51 -07:00
CitadelStationBot e80923fdf0 Automatic changelog generation for PR #8401 [ci skip] 2019-10-10 04:09:39 -05:00
kevinz000 0c9a065096 Merge pull request #8401 from Ghommie/Ghommie-cit11
Refactoring Implants' loc n°3
2019-10-10 02:09:37 -07:00
CitadelStationBot 34a540cebb Automatic changelog generation for PR #9234 [ci skip] 2019-10-10 04:09:23 -05:00
kevinz000 c1bc1d2c77 Merge pull request #9234 from Trilbyspaceclone/reebee_redone
[WIP] [TEST-MERGE] Makes clock work reebe less laggy + addtions
2019-10-10 02:09:21 -07:00
Ghommie 2ac24b2ac6 Fixing head rev blebs 2019-10-09 18:18:49 +02:00
Ghommie cfccacafbf Stops all graffiti decals from being named "letter". 2019-10-09 01:54:38 +02:00
Ghommie 50ad5f269b unrandomizes mind names. 2019-10-09 01:30:31 +02: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
Poojawa cbefe95ade Merge remote-tracking branch 'refs/remotes/Citadel-Station-13/master' into hoss-tails 2019-10-08 13:50:29 -05:00
Sishen1542 14823d3452 Update code/modules/antagonists/clockcult/clock_scriptures/scripture_drivers.dm
Co-Authored-By: Ghom <42542238+Ghommie@users.noreply.github.com>
2019-10-08 14:05:39 -04:00
Ghommie c4a8b80851 No digitigrade plasmaman suits spriting, thank you. 2019-10-08 18:43:40 +02:00
Sishen 5df84d6ab5 Update scripture_drivers.dm 2019-10-08 11:36:38 -04:00
CitadelStationBot 47c18fd052 Automatic changelog generation for PR #9445 [ci skip] 2019-10-08 07:54:47 -05:00
kevinz000 1d501342b9 Merge pull request #9445 from Thalpy/PANIC
[speedmerge] travis
2019-10-08 05:54:44 -07:00