kevinz000
|
bfb75eb26b
|
Merge pull request #11396 from Ghommie/Ghommie-cit613
Ports "Switches out the three billion args of electrocute act for flags"
|
2020-03-10 05:56:28 -07:00 |
|
Ghommie
|
ee1eea8874
|
Ports "Switches out the three billion args of electrocute act for flags"
|
2020-03-09 04:01:23 +01:00 |
|
keronshb
|
0f14fbfdac
|
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into BlobRefactor
To fixs something?
|
2020-03-08 17:51:17 -04:00 |
|
Ghom
|
64215b41a4
|
Merge pull request #11363 from Ragolution/took-it-and-threw-it-on-the-ground
Culls irrelevant targeting information on Drink Fling.
|
2020-03-08 01:39:41 +01:00 |
|
Ragolution
|
9d1cef2e97
|
Update code/modules/reagents/reagent_containers.dm
Drink slide changes recommended by Ghom p.2
Co-Authored-By: Ghom <42542238+Ghommie@users.noreply.github.com>
|
2020-03-07 01:58:17 -05:00 |
|
Ragolution
|
860d6b0827
|
Update code/modules/reagents/reagent_containers.dm
Drink slide changes recommended by Ghom p.1
Co-Authored-By: Ghom <42542238+Ghommie@users.noreply.github.com>
|
2020-03-07 01:58:06 -05:00 |
|
keronshb
|
228012c718
|
Blob refactor (#43872)
Ports over Blob Refactor from TG
|
2020-03-06 15:58:17 -05:00 |
|
Ragolution
|
1cc7d01a44
|
Culls irrelevant targeting information.
|
2020-03-06 11:39:27 -05:00 |
|
Ragolution
|
4857bd120c
|
Fixes bartender drink slide spill
Forces drink throw call to check for bartender throwing before spilling contents. Feels like a lazy fix, but it works.
|
2020-03-06 10:06:59 -05:00 |
|
Ghom
|
f24c7fb142
|
Merge pull request #11222 from Trilbyspaceclone/ashwalkers
Ashwalkers now can make a well, got their livestock back and more!
|
2020-03-06 13:48:03 +01:00 |
|
Ghom
|
b80acdfaa6
|
Update glass.dm
|
2020-03-06 05:39:18 +01:00 |
|
deathride58
|
2e35c09dec
|
Merge pull request #10451 from kevinz000/mobility_flags
Mobility flags + combat rework stuff refactoring, fixes a few edge cases including the Oh Dreaded Xenomorph Hardstuns, etc etc time to break the game
|
2020-03-05 20:03:56 -05:00 |
|
Artur
|
f879316b4e
|
All it lacked is a return.
|
2020-03-04 23:29:08 +02:00 |
|
kevinz000
|
6354b48659
|
fix
|
2020-03-03 20:58:06 -07:00 |
|
Ghom
|
0b5481f9b9
|
Merge pull request #11237 from kevinz000/reagent_logging_3
reagent logging pr attempt 3 but it works
|
2020-03-03 21:27:17 +01:00 |
|
kevinz000
|
1e99cd0bfe
|
Merge remote-tracking branch 'citadel/master' into mobility_flags
|
2020-03-03 03:08:41 -07:00 |
|
Ghom
|
9375113426
|
Merge pull request #11041 from Arturlang/kills_blood_tomatoe_succ
Bloodsucker external blood gain rebalancing
|
2020-03-02 16:36:22 +01:00 |
|
Arturlang
|
97c5aa1e24
|
Maintainer suggestions
Co-Authored-By: Ghom <42542238+Ghommie@users.noreply.github.com>
|
2020-03-01 16:48:49 +02:00 |
|
Ghom
|
295cd2991d
|
Merge pull request #11227 from Putnam3145/salbut-jitter
Gave jittering to salbutamol
|
2020-02-29 20:42:03 +01:00 |
|
Artur
|
b536c061fb
|
Reviewer suggestion and co
|
2020-02-26 16:26:57 +02:00 |
|
kevinz000
|
5144e45ba9
|
it works now :D
|
2020-02-24 15:32:46 -07:00 |
|
kevinz000
|
bbcc9cf4e5
|
never ever webeditor
|
2020-02-24 15:15:21 -07:00 |
|
kevinz000
|
672da86c51
|
NEVERWEBEDITORGUYS
|
2020-02-24 15:08:08 -07:00 |
|
kevinz000
|
5ad51758e0
|
fix
|
2020-02-24 15:04:25 -07:00 |
|
kevinz000
|
388a804add
|
Merge remote-tracking branch 'citadel/kevinz000-patch-15' into kevinz000-patch-17
|
2020-02-24 15:03:20 -07:00 |
|
kevinz000
|
c739091285
|
Merge remote-tracking branch 'citadel/kevinz000-patch-11' into kevinz000-patch-17
|
2020-02-24 15:03:05 -07:00 |
|
kevinz000
|
526471510f
|
Merge remote-tracking branch 'citadel/kevinz000-patch-17-1' into kevinz000-patch-17
|
2020-02-24 15:03:02 -07:00 |
|
kevinz000
|
306b711ab1
|
Update reagents.dm
|
2020-02-24 14:30:50 -07:00 |
|
kevinz000
|
2b3e8a64f7
|
Update holder.dm
|
2020-02-24 14:23:44 -07:00 |
|
kevinz000
|
5cece42c1a
|
Update glass.dm
|
2020-02-24 14:20:40 -07:00 |
|
kevinz000
|
23aa38a381
|
Update reagent_containers.dm
|
2020-02-24 14:17:48 -07:00 |
|
kevinz000
|
c6a0418946
|
Update reagent_containers.dm
|
2020-02-24 14:10:53 -07:00 |
|
kevinz000
|
3709992b46
|
Update reagent_containers.dm
|
2020-02-24 14:07:58 -07:00 |
|
kevinz000
|
77edc602dc
|
Update glass.dm
|
2020-02-24 13:59:27 -07:00 |
|
kevinz000
|
d4657df9f5
|
Update glass.dm
|
2020-02-24 13:58:51 -07:00 |
|
kevinz000
|
1668bc598a
|
Update glass.dm
|
2020-02-24 13:55:44 -07:00 |
|
Putnam
|
feaadffd93
|
Gave jittering to salbutamol.
|
2020-02-24 11:23:51 -08:00 |
|
TrilbySpaceClone
|
525cedf16a
|
this just works
|
2020-02-24 11:45:47 -05:00 |
|
kevinz000
|
f6542b381c
|
Merge remote-tracking branch 'citadel/master' into mobility_flags
|
2020-02-21 23:29:25 -07:00 |
|
Ghommie
|
8fbfd07692
|
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit229
|
2020-02-22 00:55:32 +01:00 |
|
kevinz000
|
a784a74ccb
|
Merge remote-tracking branch 'citadel/master' into mobility_flags
|
2020-02-21 13:35:26 -07:00 |
|
kevinz000
|
ca777c6c8b
|
Merge pull request #11153 from Ghommie/Ghommie-cit587
Fixing addiction moodlets not going away and secret sauce recipe paper.
|
2020-02-20 06:17:33 -07:00 |
|
Artur
|
35aecac620
|
Disgust mood for bloodsuckers being disgusted, and blood bag inneficency
|
2020-02-20 12:50:25 +02:00 |
|
Ghom
|
f94f997cc2
|
Merge pull request #11080 from kevinz000/surubatons
hey someone gave me this idea for stunbatons (and I sort of expanded it) and it's worth a test
|
2020-02-20 11:09:46 +01:00 |
|
kevinz000
|
c7273c03be
|
Merge remote-tracking branch 'citadel/master' into mobility_flags
|
2020-02-19 19:12:27 -07:00 |
|
kevinz000
|
49279086b7
|
Merge pull request #11113 from CameronWoof/biogeneratin'
Adds diethylamine and saltpetre to the biogenerator
|
2020-02-19 19:03:35 -07:00 |
|
kevinz000
|
8567346501
|
Merge pull request #10953 from Ghommie/Ghommie-cit564
The awesome adventures of the missing spurdo line replacement file.
|
2020-02-19 19:00:53 -07:00 |
|
kevinz000
|
b983aa75ea
|
Merge pull request #11145 from Ghommie/Ghommie-cit586
Something about pAIs and silicon access priviledges.
|
2020-02-19 18:59:10 -07:00 |
|
Ghommie
|
37ba75ec12
|
Fixing addiction moodlets not going away and secret sauce recipe paper.
|
2020-02-19 14:07:11 +01:00 |
|
Artur
|
d635af0caa
|
Conflict Fix
|
2020-02-19 13:11:33 +02:00 |
|