 BlackMajor
|
4528384976
|
Fuck it lets add way more spiciest PR
|
2019-06-15 19:03:04 +12:00 |
|
|
Ghommie
|
280e7d7d81
|
stops borgs from sprinting into negative cell charge.
|
2019-06-15 04:36:40 +02:00 |
|
|
LetterJayandGitHub
|
0a144545c5
|
Merge pull request #8625 from Trilbyspaceclone/Donator-1
Blue Kimono for SFox63 - Donator
|
2019-06-14 21:18:28 -05:00 |
|
|
CitadelStationBot
|
c43d96e21c
|
Automatic changelog generation for PR #8611 [ci skip]
|
2019-06-14 19:50:07 -05:00 |
|
|
deathride58andGitHub
|
fdc0e4f957
|
Merge pull request #8611 from Poojawa/digitigrade-socks
Digitigrade socks
|
2019-06-14 20:50:05 -04:00 |
|
|
deathride58andGitHub
|
b1f1b2a57d
|
Merge pull request #8609 from Poojawa/simple_mob_nomming-I-guess
Client check to possibly fix #8542
|
2019-06-14 20:49:28 -04:00 |
|
|
CitadelStationBot
|
0d5c54b1b7
|
Automatic changelog generation for PR #8634 [ci skip]
|
2019-06-14 19:44:21 -05:00 |
|
|
deathride58andGitHub
|
d79a58b3f4
|
Merge pull request #8634 from Ghommie/Ghommie-cit46
fixes low-charge stunbatons & co.
|
2019-06-14 20:44:19 -04:00 |
|
|
Ghommie
|
a3c2ed0b52
|
fixes.
|
2019-06-15 02:19:57 +02:00 |
|
|
deathride58andGitHub
|
2f47fbdd8b
|
Merge pull request #8628 from BlackMajor/Pie
Cream Pies now transfer a portion of their reagents on hitting someone
|
2019-06-14 19:18:12 -04:00 |
|
|
CitadelStationBot
|
48b4156fb6
|
Automatic changelog generation for PR #8633 [ci skip]
|
2019-06-14 18:08:52 -05:00 |
|
|
deathride58andGitHub
|
fc332880c4
|
Merge pull request #8633 from Arturlang/Atmos_Updates
Examine text for pumps and typo fixes.
|
2019-06-14 19:08:50 -04:00 |
|
|
TrilbyspacecloneandGitHub
|
f32291146b
|
Update all_nodes.dm
|
2019-06-14 12:02:55 -04:00 |
|
|
TrilbyspacecloneandGitHub
|
c5e3010cfa
|
Update misc_designs.dm
|
2019-06-14 12:01:52 -04:00 |
|
|
CitadelStationBot
|
7433293a3e
|
Automatic changelog generation for PR #8624 [ci skip]
|
2019-06-14 10:53:05 -05:00 |
|
|
kevinz000andGitHub
|
6fdb0670ee
|
Merge pull request #8624 from Arturlang/Fix_High_Alarm_ERT_Suit
[READY] Fixes High Alert ERT suits
|
2019-06-14 08:53:02 -07:00 |
|
|
UserothandGitHub
|
ec1ff9ada3
|
The joy of making an error in a webedit.
|
2019-06-14 13:05:36 +02:00 |
|
|
UserothandGitHub
|
bd35b8696c
|
Another commit to get fucking Travis going.
|
2019-06-14 12:52:03 +02:00 |
|
|
ArturlangandGitHub
|
fb150c355e
|
Merge pull request #1 from Arturlang/master
hopefully this works to fix travis
|
2019-06-14 11:47:14 +03:00 |
|
|
Ghommie
|
cf56870b57
|
Fixes the sacrificial target icon not displaying on the cult objective alert.
|
2019-06-13 23:48:15 +02:00 |
|
|
Ghommie
|
adaa5840c1
|
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit46
|
2019-06-13 23:18:22 +02:00 |
|
|
kevinz000andGitHub
|
35e280b058
|
Merge pull request #8641 from Ghommie/Ghommie-cit47
port "PR to make travis use xenial and to make it work"
|
2019-06-13 14:14:35 -07:00 |
|
|
Ghommie
|
84bb5d90ce
|
newlines.
|
2019-06-13 22:54:41 +02:00 |
|
|
Ghommie
|
27b7010181
|
Proof of my asinine acts.
|
2019-06-13 22:52:12 +02:00 |
|
|
Ghommie
|
0206a534b0
|
add in spaces.
|
2019-06-13 22:20:47 +02:00 |
|
|
Ghommie
|
c37c432de6
|
port "PR to make travis use xenial and to make it work"
|
2019-06-13 22:18:13 +02:00 |
|
|
TrilbySpaseClone
|
1c45e2c615
|
Suggested
|
2019-06-13 16:02:48 -04:00 |
|
|
UserothandGitHub
|
3f4d9319e9
|
Update energy_net_nets.dm
|
2019-06-13 20:38:22 +02:00 |
|
|
UserothandGitHub
|
e3acef755a
|
Fuck you again, Travis. Do it right this time.
|
2019-06-13 20:33:45 +02:00 |
|
|
Useroth
|
bab2ec4789
|
Travis, I fucking mean it. Compile it.
|
2019-06-13 15:46:12 +02:00 |
|
|
Useroth
|
5e90c530e0
|
Travis, you whore, compile it properly.
|
2019-06-13 15:37:18 +02:00 |
|
|
Useroth
|
591e5eb64d
|
Merge branch 'ninja-shit' of github.com:Useroth/Citadel-Station-13 into ninja-shit
|
2019-06-13 15:28:26 +02:00 |
|
|
Useroth
|
2d977becb5
|
Finally fixed the net breaking mechanics.
|
2019-06-13 15:27:57 +02:00 |
|
|
UserothandUseroth
|
39bedb8341
|
Update ninjaDrainAct.dm
|
2019-06-13 15:27:56 +02:00 |
|
|
Useroth
|
ee661d1eb8
|
An afterthought regarding healing/reviving the capturees.
|
2019-06-13 15:27:56 +02:00 |
|
|
Useroth
|
35fe334fe8
|
Small tweak.
|
2019-06-13 15:27:56 +02:00 |
|
|
Useroth
|
231da023ec
|
Makes the gloves actually stun people.
|
2019-06-13 15:27:55 +02:00 |
|
|
Useroth
|
df15e53cd3
|
Another attempt at the nets not being breakable with bare hands. Now with more consideration.
|
2019-06-13 15:27:55 +02:00 |
|
|
Useroth
|
2e5ad2f4d8
|
Might as well crank it up a little more.
|
2019-06-13 15:27:55 +02:00 |
|
|
Useroth
|
7fd2c60992
|
Makes energy nets a bit sturdier and unbreakable with bare hands.
|
2019-06-13 15:27:54 +02:00 |
|
|
Useroth
|
04a1c7ada4
|
Energy net and capture objective tweak.
|
2019-06-13 15:27:54 +02:00 |
|
|
Useroth
|
f9c249b644
|
Energy net tweak to make it less clunky to use.
|
2019-06-13 15:27:54 +02:00 |
|
|
Useroth
|
e33c57d8de
|
Finally fixed the net breaking mechanics.
|
2019-06-13 15:19:12 +02:00 |
|
|
BlackMajor
|
9b01830987
|
Added fuel tank and welding goggles
|
2019-06-13 21:37:45 +12:00 |
|
|
Fermi
|
17403bd059
|
Non-functioning EMP code for review (revert before merging.)
|
2019-06-13 00:58:54 +01:00 |
|
|
Ghommie
|
e2bf5b73fd
|
I'm being too careless, sorry for the many commits.
|
2019-06-12 23:22:31 +02:00 |
|
|
Ghommie
|
7a8eaf41ac
|
another get_cell()
|
2019-06-12 23:21:42 +02:00 |
|
|
Ghommie
|
5ba46eb517
|
Avoid runtiming.
|
2019-06-12 23:20:34 +02:00 |
|
|
Ghommie
|
2edef99b08
|
.
|
2019-06-12 23:16:27 +02:00 |
|
|
Ghommie
|
a29095cbe1
|
Penitence for the awful mistakes I have done in the refactor.
|
2019-06-12 23:06:09 +02:00 |
|