Thalpy
|
cc39c9f896
|
Merge branch 'master' into master
|
2019-07-06 16:03:17 +01:00 |
|
kevinz000
|
77743c9a0f
|
Merge pull request #8794 from Ghommie/Ghommie-cit100
Fixes the uplink category indexing.
|
2019-07-05 06:56:22 -07:00 |
|
Thalpy
|
8a6e669060
|
Merge branch 'master' into master
|
2019-07-04 03:14:29 +01:00 |
|
kevinz000
|
10a584c71f
|
Merge pull request #8776 from Ghommie/Ghommie-cit96
Porting in donut fixes, beepsky smash and Neurotoxin reworks.
|
2019-07-03 13:45:02 -07:00 |
|
kevinz000
|
78357018d6
|
Merge pull request #8783 from Ghommie/Ghommie-cit98
Fixing some emergency pod storage refactor fuck ups.
|
2019-07-03 13:42:49 -07:00 |
|
Ghommie
|
1fd50cc15a
|
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit96
|
2019-07-03 04:52:57 +02:00 |
|
Fermi
|
27aad8f117
|
Quick in case.
|
2019-07-02 22:42:07 +01:00 |
|
Fermi
|
d83fe49556
|
+lewdchem pref on CC -EnthrallExpo from botany, tweaks messages on EExpo
|
2019-07-02 15:03:19 +01:00 |
|
Ghommie
|
595398d76e
|
yea
|
2019-06-30 17:47:35 +02:00 |
|
kevinz000
|
09c8a45fe2
|
Merge pull request #8770 from Arturlang/Carp_Deflecting
Carp now deflects the bullets instead of making them dissapear.
|
2019-06-29 20:08:47 -07:00 |
|
Ghommie
|
dc20b605fb
|
Fixing some emergency pod storage refactor fuck ups.
|
2019-06-30 00:40:39 +02:00 |
|
Thalpy
|
696d879874
|
Merge branch 'master' into master
|
2019-06-29 15:48:25 +01:00 |
|
kevinz000
|
c495a2aa47
|
Merge pull request #8739 from Sishen1542/makinggolemsgreatagain
Ports additional tg golem types! Leather, cardboard, bronze & bone. Ports bone hurting juice as well!
|
2019-06-28 20:32:15 -07:00 |
|
Ghommie
|
06ce8c6245
|
I thought I commited these already. turns out I were wrong.
|
2019-06-28 23:30:19 +02:00 |
|
Ghommie
|
d93e63af53
|
we just want the trauma to be niche, not unachievable.
|
2019-06-28 23:21:10 +02:00 |
|
Ghommie
|
3291b9c47a
|
Porting in donut fixes, beepsky smash and Neurotoxin reworks.
|
2019-06-28 23:17:12 +02:00 |
|
kevinz000
|
f7bbca8918
|
Merge pull request #8731 from Ghommie/Ghommie-cit81
Ports in microwave updates and its radial menu.
|
2019-06-28 05:19:04 -07:00 |
|
Arturlang
|
69a62314e9
|
Defines so carp reroutes the deflects
|
2019-06-28 11:37:12 +03:00 |
|
Arturlang
|
eb8133cf3b
|
Defines var
Filthy webedits, i know.
|
2019-06-28 11:35:00 +03:00 |
|
Fermi
|
fa9ae6d2e7
|
Feedback regarding trait
|
2019-06-25 23:52:38 +01:00 |
|
Fermi
|
4145b0f256
|
Hotfix for egregious oversights.
|
2019-06-25 07:22:20 +01:00 |
|
Fermi
|
fdba8c000f
|
Fixing compiling errors.
|
2019-06-23 20:03:37 +01:00 |
|
Fermi
|
10109d0fe5
|
Merge branch 'pr/18'
|
2019-06-23 19:15:07 +01:00 |
|
Fermi
|
b309490190
|
Forgot to ctrl+s
|
2019-06-23 19:02:53 +01:00 |
|
Fermi
|
8992dbfa4d
|
Commented out hypnoquirk and edited it so that it functions differently
|
2019-06-23 18:59:15 +01:00 |
|
kevinz000
|
c9d67ecd49
|
Merge pull request #8667 from Ghommie/Ghommie-cit61
Ports the system for randomized semi-persistent chem reactions.
|
2019-06-23 06:54:43 -07:00 |
|
kevinz000
|
294e1e48d2
|
Merge pull request #8659 from Ghommie/Ghommie-cit57
ports "Componentizes orbiting"
|
2019-06-23 06:50:32 -07:00 |
|
kevinz000
|
94d92f7b1b
|
Merge pull request #8664 from BlackMajor/MeMapGood
Adds another space ruin
|
2019-06-23 06:49:37 -07:00 |
|
kevinz000
|
082d6c75a9
|
Merge pull request #8688 from Ghommie/Ghommie-cit67
Ports in bee plushes.
|
2019-06-23 06:45:49 -07:00 |
|
Sishen
|
a2a440a92c
|
golem gang golem gang golem gang golem gang
|
2019-06-23 04:27:50 -04:00 |
|
Ghommie
|
2e30b91567
|
Ports in microwave updates and its radial menu.
|
2019-06-23 06:10:49 +02:00 |
|
Fermi
|
21c17813b8
|
Guess who should've compile tested!
|
2019-06-23 01:20:11 +01:00 |
|
Fermi
|
713d849c03
|
Merge remote-tracking branch 'upstream/master'
|
2019-06-19 21:02:30 +01:00 |
|
Ghommie
|
f963ca050b
|
thanks, badcoder trilby
|
2019-06-18 23:49:20 +02:00 |
|
kevinz000
|
4f42d40681
|
Merge pull request #8507 from Thalpy/Wheelchairs
Adds Hoverchairs and the paraplegic trait.
|
2019-06-17 11:13:43 -07:00 |
|
Fermi
|
4526832e7d
|
I'm spending too much time trying to fix something rejected.
|
2019-06-17 15:16:45 +01:00 |
|
Fermi
|
d092dd1da0
|
Testing hypnoquirk
|
2019-06-17 12:47:23 +01:00 |
|
Fermi
|
59469fae2e
|
Oops.
|
2019-06-17 12:40:30 +01:00 |
|
Fermi
|
49c76986ca
|
Whoops
|
2019-06-17 12:31:45 +01:00 |
|
Thalpy
|
41eee65b15
|
Merge branch 'master' into master
|
2019-06-17 12:18:40 +01:00 |
|
Fermi
|
0457026c0f
|
Missed another.
|
2019-06-17 12:15:54 +01:00 |
|
Fermi
|
dd7421f130
|
Missed one.
|
2019-06-17 12:05:21 +01:00 |
|
Ghommie
|
50dd512be7
|
Ports system for randomized semi-persistent chem reactions.
|
2019-06-17 10:50:40 +02:00 |
|
BlackMajor
|
1060bb05b4
|
Space hermit ruin
|
2019-06-17 17:41:46 +12:00 |
|
kevinz000
|
d9119d43f0
|
Merge pull request #8627 from BlackMajor/MeMapGood
Adds more space ruins.
|
2019-06-16 19:29:23 -07:00 |
|
Ghommie
|
b782226900
|
ports "Componentizes orbiting"
|
2019-06-17 00:19:57 +02:00 |
|
Thalpy
|
fb70b97d5b
|
Tweaks hypnoquirk as the discord seems to really want it.
|
2019-06-16 20:24:36 +01:00 |
|
Thalpy
|
98fc55e9f8
|
Merge branch 'master' into Wheelchairs
|
2019-06-16 17:33:57 +01:00 |
|
kevinz000
|
1408a453de
|
Merge pull request #8591 from Ghommie/Ghommie-cit43
You smell that? Napalm, son.
|
2019-06-16 01:16:12 -07:00 |
|
kevinz000
|
1c46bcef7e
|
Merge pull request #8479 from Ghommie/Ghommie-cit21
Krav maga leg sweep tweak.
|
2019-06-16 01:13:08 -07:00 |
|