Thalpy
|
ac2aba50a6
|
Turns Jacq into her own event
|
2019-10-13 22:33:46 +01:00 |
|
Thalpy
|
356a1279f1
|
Adds vars for the ball.
|
2019-10-13 20:06:40 +01:00 |
|
Fermi
|
ecfc988911
|
Okay!
|
2019-10-12 09:15:32 +01:00 |
|
Fermi
|
7bce68bb11
|
Merge branch 'master' into Spookytime
|
2019-10-11 21:51:48 +01:00 |
|
Fermi
|
6e7c433536
|
Song fix
|
2019-10-11 21:34:30 +01:00 |
|
kevinz000
|
d33b866805
|
Merge pull request #9467 from deathride58/compscithree
[s] fixes client analyzation having cid and ip swapped
|
2019-10-11 12:34:25 -07:00 |
|
deathride58
|
a2f5395b39
|
[s] fixes the client analyzation having cid and ip swapped
|
2019-10-11 15:16:35 -04:00 |
|
kevinz000
|
46994f2475
|
Merge pull request #9448 from MrJWhit/zombie-eyes
Makes zombie smell through their eyes
|
2019-10-11 12:16:06 -07: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
|
620af601b2
|
Merge pull request #9437 from JTGSZ/clothingrestrictions
Optional Species based clothing restrictions
|
2019-10-11 12:08:57 -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
|
2e74833e72
|
Merge pull request #9444 from Thalpy/Updates-holder
[Testmerge first] [Ready] Cleans up holder.dm code and fixes some of the cross bugs from shotgun PR merging.
|
2019-10-11 12:08:12 -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 |
|
kevinz000
|
9805e1b5fb
|
Merge pull request #9458 from Ghommie/Ghommie-cit228
Nerfs cyborg disabler to hold 25 shots rather than 43, just like a normal disabler.
|
2019-10-11 12:04:49 -07:00 |
|
Fermi
|
dbcda948fb
|
Darn thing
|
2019-10-11 19:56:58 +01:00 |
|
Fermi
|
cd47412db2
|
Merge branch 'master' into Spookytime
|
2019-10-11 19:10:48 +01:00 |
|
Fermi
|
f165b5e813
|
darn nutrients.
|
2019-10-11 18:58:53 +01:00 |
|
Fermi
|
bfd97a82ca
|
Eh 4 mins.
|
2019-10-11 18:56:33 +01:00 |
|
Sishen
|
c51bfc153b
|
b
|
2019-10-11 13:24:00 -04:00 |
|
Fermi
|
8f6c988536
|
Explod
|
2019-10-11 18:17:43 +01:00 |
|
Fermi
|
8e71a20528
|
Oops
|
2019-10-11 18:16:25 +01:00 |
|
Fermi
|
ae46b2932e
|
Bath is ready to go.
|
2019-10-11 18:15:46 +01:00 |
|
Fermi
|
3009f8b2cc
|
Meow
|
2019-10-11 17:56:24 +01:00 |
|
Fermi
|
d21f7f9a9b
|
Jacq fix
|
2019-10-11 15:26:39 +01:00 |
|
Fermi
|
349b5f4369
|
GRUMBLING INTENSIFIES
|
2019-10-11 14:36:35 +01:00 |
|
Fermi
|
3ae8581d96
|
HOPE
|
2019-10-11 14:34:40 +01:00 |
|
YakumoChen
|
55e7645773
|
updating branch
|
2019-10-11 04:55:57 -04:00 |
|
Thalpy
|
e517ece612
|
Darnit beaker
|
2019-10-11 08:41:08 +01:00 |
|
Ghommie
|
e734b36ee3
|
quickfixes lowpop nuclear war tc malus calculation.
|
2019-10-10 20:54:19 +02: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
|
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 |
|
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 |
|
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 |
|
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 |
|
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 |
|
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 |
|
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 |
|
Thalpy
|
41946dd9cf
|
Updates icons
|
2019-10-10 09:27:15 +01:00 |
|
Thalpy
|
348f6a4db4
|
Fixes Icons
|
2019-10-10 07:36:44 +01:00 |
|
Thalpy
|
eaa84418c9
|
Fixes compile errors
|
2019-10-10 07:17:22 +01:00 |
|
Ghommie
|
689136fe94
|
Nerfs cyborg disabler to hold 25 shots rather than 43, just like a normal disabler.
|
2019-10-09 23:07:39 +02:00 |
|
Fermi
|
8f9622cbe2
|
Well lets try it
|
2019-10-09 18:01:09 +01:00 |
|
Fermi
|
53e8d64388
|
Ah I see now
|
2019-10-09 17:51:14 +01:00 |
|
Ghommie
|
2ac24b2ac6
|
Fixing head rev blebs
|
2019-10-09 18:18:49 +02:00 |
|