 LetterJayandGitHub
|
b374f2c22d
|
Merge pull request #3139 from Citadel-Station-13/upstream-merge-31287
[MIRROR] Correctly applies wizard names
|
2017-10-05 08:31:56 -04:00 |
|
|
LetterJayandGitHub
|
90a66c9944
|
Merge pull request #3138 from Citadel-Station-13/upstream-merge-31289
[MIRROR] Makes the energy katana swwwwwwish when drawn
|
2017-10-05 08:31:42 -04:00 |
|
|
LetterJayandGitHub
|
915e79e59b
|
Merge pull request #3135 from Citadel-Station-13/upstream-merge-31281
[MIRROR] Removes /datum/reagents/process(), changes cryostylane & pyrosium reaction speed
|
2017-10-05 08:31:23 -04:00 |
|
|
LetterJayandGitHub
|
3d364f08f2
|
Update holder.dm
|
2017-10-05 07:11:14 -05:00 |
|
|
LetterJayandGitHub
|
8e1a31c8af
|
Update holder.dm
|
2017-10-05 06:51:59 -05:00 |
|
|
LeoandCitadelStationBot
|
5a0d1e5aeb
|
Merge pull request #31294 from YPOQ/sciencetoolfix
Fix abductor scientist being unable to use science tool
|
2017-10-05 06:49:54 -05:00 |
|
|
LeoandCitadelStationBot
|
ced865f76d
|
Merge pull request #31290 from YPOQ/jaunterfix
Fixes jaunters chasm-saving feature
|
2017-10-05 06:48:42 -05:00 |
|
|
LetterJayandGitHub
|
47b72055cd
|
Update shuttle.dm
|
2017-10-05 05:19:49 -05:00 |
|
|
LetterJayandGitHub
|
abeb003465
|
Update preferences_savefile.dm
|
2017-10-05 05:18:04 -05:00 |
|
|
LetterJayandGitHub
|
f9cd7aa5b3
|
Merge branch 'master' into upstream-merge-31289
|
2017-10-05 06:15:44 -04:00 |
|
|
LetterJayandGitHub
|
08f3503a81
|
Update holder.dm
|
2017-10-05 05:14:27 -05:00 |
|
|
LetterJayandGitHub
|
05770366b5
|
Merge pull request #3122 from Citadel-Station-13/upstream-merge-31273
[MIRROR] Moves all stack object sprites from items_and_weapons.dmi to their own file
|
2017-10-05 06:10:55 -04:00 |
|
|
orangesandCitadelStationBot
|
bb9982e772
|
Merge pull request #31296 from ShizCalev/landmark-cleanup
Cleans up and fixes old landmarks
|
2017-10-05 03:05:40 -05:00 |
|
|
orangesandCitadelStationBot
|
cedb56af1b
|
Merge pull request #31302 from ninjanomnom/shuttle-rotation
Move shuttleRotate into the shuttle module
|
2017-10-05 03:05:32 -05:00 |
|
|
orangesandCitadelStationBot
|
574e166951
|
Merge pull request #31269 from Firecage/doublehardsuitrebalance
Makes the ERT and Chronosuit hardsuits and helmets have the same armor stats.
|
2017-10-05 03:02:11 -05:00 |
|
|
Ashe HiggsandCitadelStationBot
|
682269ab63
|
Lizzers and plasmamen can now be servants of Ratvar (#31244)
* Removes racial discrimination from Ratvar's servants
* Activates plasma internals; thank you Y0SH1M4S73R!
* Update clock_cult.dm
|
2017-10-05 03:01:01 -05:00 |
|
|
JJRcopandCitadelStationBot
|
4ecc019353
|
Moved admin music volume slider to its own menu (#31277)
* Moved admin music volume slider to its own menu
* Minor fixes to goonchat
|
2017-10-05 02:59:52 -05:00 |
|
|
Emmett GainesandCitadelStationBot
|
d50c0e10f6
|
Makes shuttle movement a bit smoother and faster
|
2017-10-05 02:31:10 -05:00 |
|
|
RandomMarineandCitadelStationBot
|
fb7a0d7606
|
Experimental fix for bloom issue (#31299)
|
2017-10-04 23:25:06 -05:00 |
|
|
LetterJayandGitHub
|
e6830cfec3
|
Merge pull request #3103 from Citadel-Station-13/upstream-merge-31222
[MIRROR] Ports dash weapons to the dash datum
|
2017-10-04 23:01:59 -04:00 |
|
|
LetterJayandGitHub
|
c2d8f048f8
|
Update cult_items.dm
|
2017-10-04 21:49:46 -05:00 |
|
|
LetterJayandGitHub
|
7c4373c1fe
|
Update cult_items.dm
|
2017-10-04 21:15:11 -05:00 |
|
|
LetterJayandGitHub
|
f57929b26c
|
Update book.dm
|
2017-10-04 21:14:25 -05:00 |
|
|
LetterJayandGitHub
|
d4cd519730
|
Merge pull request #3123 from Citadel-Station-13/upstream-merge-31276
[MIRROR] Moves laughter to the emote
|
2017-10-04 22:01:49 -04:00 |
|
|
LetterJayandGitHub
|
09f6eb6156
|
Update preferences_savefile.dm
|
2017-10-04 20:53:42 -05:00 |
|
|
LetterJayandGitHub
|
4c38a8b1e2
|
Update energy_katana.dm
|
2017-10-04 20:51:37 -05:00 |
|
|
LetterJayandGitHub
|
365adf852c
|
Merge branch 'master' into upstream-merge-31222
|
2017-10-04 21:50:07 -04:00 |
|
|
Supermichael777andCitadelStationBot
|
63aa1c7153
|
Makes the pda font a prefernce
|
2017-10-04 19:28:57 -05:00 |
|
|
LeoandCitadelStationBot
|
c873c17478
|
Merge pull request #31284 from tgstation/Cyberboss-patch-1
Code cleanup in snack_meats.dm
|
2017-10-04 19:27:47 -05:00 |
|
|
LeoandCitadelStationBot
|
39cf9bb7a0
|
Merge pull request #31286 from KorPhaeron/ismachinery
ismachinery define
|
2017-10-04 19:26:38 -05:00 |
|
|
LeoandCitadelStationBot
|
dec28eabfc
|
Merge pull request #31287 from ShizCalev/wizard-name
Correctly applies wizard names
|
2017-10-04 19:26:31 -05:00 |
|
|
LeoandCitadelStationBot
|
e5f5b427ba
|
Makes the energy katana swwwwwwish when drawn
|
2017-10-04 19:25:21 -05:00 |
|
|
deathride58
|
b37556a951
|
makes responsibility objective a little more clear
|
2017-10-04 20:19:43 -04:00 |
|
|
deathride58
|
5692228379
|
Merge remote-tracking branch 'refs/remotes/Citadel-Station-13/master' into crewobjectivesandmiscreants
|
2017-10-04 20:18:41 -04:00 |
|
|
deathride58
|
5cefa71992
|
Merge remote-tracking branch 'refs/remotes/Citadel-Station-13/master' into crewobjectivesandmiscreants
|
2017-10-04 20:18:03 -04:00 |
|
|
LetterJayandGitHub
|
13cf0696e0
|
Merge branch 'master' into upstream-merge-31198
|
2017-10-04 19:06:42 -04:00 |
|
|
LetterJayandGitHub
|
1a70aa0227
|
Merge pull request #3041 from Citadel-Station-13/upstream-merge-30887
[MIRROR] 2H Sword to the Cult Forge - Robustin's Github Adventure
|
2017-10-04 19:06:02 -04:00 |
|
|
orangesandCitadelStationBot
|
42c59b67b5
|
Removes /datum/reagents/process(), changes cryostylane & pyrosium reaction speed
|
2017-10-04 17:55:39 -05:00 |
|
|
LetterJayandGitHub
|
3fdc29ba42
|
Merge pull request #3134 from Citadel-Station-13/upstream-merge-31283
[MIRROR] Fixes shaking people up while buckled into a bed/resin nest
|
2017-10-04 18:45:09 -04:00 |
|
|
LetterJayandGitHub
|
9ee8b6298f
|
Merge pull request #3133 from Citadel-Station-13/upstream-merge-31275
[MIRROR] Adds deconstruction hints to various things
|
2017-10-04 18:44:50 -04:00 |
|
|
LetterJayandGitHub
|
c2fe00cebd
|
Merge pull request #3132 from Citadel-Station-13/upstream-merge-31264
[MIRROR] Preliminary blast cannon cleanup
|
2017-10-04 18:44:38 -04:00 |
|
|
LetterJayandGitHub
|
ecf44ff651
|
Merge pull request #3131 from Citadel-Station-13/upstream-merge-31150
[MIRROR] Sets KEEP_TOGETHER appearance_flag for humans, energy draining text updated to DisplayPower
|
2017-10-04 18:44:21 -04:00 |
|
|
LetterJayandGitHub
|
b217a804b6
|
Merge pull request #3130 from Citadel-Station-13/upstream-merge-31238
[MIRROR] Space vision fix V2.0 - GAME_PLANE change
|
2017-10-04 18:44:08 -04:00 |
|
|
LetterJayandGitHub
|
aa91d6193b
|
Merge pull request #3129 from Citadel-Station-13/upstream-merge-31254
[MIRROR] Hosts can lock config options from admins
|
2017-10-04 18:43:55 -04:00 |
|
|
LetterJayandGitHub
|
4610a7a61d
|
Merge pull request #3128 from Citadel-Station-13/upstream-merge-31180
[MIRROR] removes carp piggyback exploit
|
2017-10-04 18:43:31 -04:00 |
|
|
LetterJayandGitHub
|
e6ccc7077a
|
Merge pull request #3126 from Citadel-Station-13/upstream-merge-31279
[MIRROR] why plus a minus value and not just minus the value...
|
2017-10-04 18:43:04 -04:00 |
|
|
LetterJayandGitHub
|
cfd98caf98
|
Update emote.dm
|
2017-10-04 17:42:38 -05:00 |
|
|
LetterJayandGitHub
|
8c77408bb1
|
Merge pull request #3114 from Daniel0Mclovin/patch-2
Rebalanced pod people so they arnt as weak.
|
2017-10-04 18:42:02 -04:00 |
|
|
LetterJayandGitHub
|
944c749dfc
|
Merge pull request #3117 from Citadel-Station-13/upstream-merge-31256
[MIRROR] Zombies regen toxin damage
|
2017-10-04 18:41:45 -04:00 |
|
|
LetterJayandGitHub
|
6fe3f2a6b9
|
Merge pull request #3105 from Citadel-Station-13/upstream-merge-31125
[MIRROR] Fixes stealth nerf to detectives gun
|
2017-10-04 18:40:56 -04:00 |
|