cyberpresidentvanellope/Yogstation
1
0
Fork 0
mirror of https://github.com/yogstation13/Yogstation.git synced 2025-02-26 09:04:50 +00:00
Code Issues Packages Projects Releases Wiki Activity
33,531 Commits 21 Branches 0 Tags
bfa70f3d4c16a2f906537a2898dc6bbf09593bbc
Commit Graph

26729 Commits

Author SHA1 Message Date
bawhoppen
bfa70f3d4c okay that too 2016-05-01 16:49:28 -05:00
bawhoppen
7aa5e85dba fixed memes 2016-05-01 16:48:29 -05:00
Lularian
31ced651d0 commits, what are they good for 2016-05-01 00:51:17 -05:00
Joan Lung
43ada53037 Merge pull request #17272 from KorPhaeron/dragon 
Fixes Dragon Explosion Log Spam
 2016-04-30 15:04:54 -04:00
KorPhaeron
3f486d82c8 Merge pull request #17246 from tgstation/RemieRichards-vote-improvements 
vote improvements
 2016-04-30 13:44:06 -05:00
Cheridan
55514c3be6 Merge pull request #17233 from coiax/mining-item-stats 
Added more stat tracking to mining items and engine generation
 2016-04-30 08:21:41 -05:00
AnturK
91fd7d4212 Merge pull request #17210 from Zuvassin/redoingbecausemergefailfml 
Fixes issues with survival pod GPS and Fans not able to be deconstructed
 2016-04-30 14:06:27 +02:00
Cheridan
35a975f82b Merge pull request #17221 from phil235/FixGib 
Fixes bugs with gib()
 2016-04-30 06:58:29 -05:00
bgobandit
e5ed72520e Ports Cards Against Spess from Polaris (MERGEPLS) (#15872) 
* Ports Cards Against Spess from Polaris

* moar

* more

* Moves cards to config files, adds a fuckton more

* ADDS THE FUCKING CARDS TO THE FUCKING MAP TAKE 3 HATE SALT

* fixes the maps, shuts travis THE FUCK UP

* fixes typo

* makes requested changes
 2016-04-30 13:35:51 +02:00
phil235
84dcf0dd3f dammit. 2016-04-30 12:33:12 +02:00
KorPhaeron
d8db2a1643 Merge pull request #17224 from ChangelingRain/IDlock 
Hitting a locker or crate with an ID, PDA with ID, or wallet with ID will try to toggle the lock instead of opening it
 2016-04-30 05:32:42 -05:00
phil235
04018648d1 Merge branch 'master' of https://github.com/tgstation/-tg-station into FixGib 
Conflicts:
	code/modules/mob/living/death.dm
	code/modules/mob/living/simple_animal/simple_animal.dm
 2016-04-30 12:30:36 +02:00
Cheridan
5a766b0a63 Merge pull request #17236 from optimumtact/patch-2 
Fix call to add reagent for inacusiate
 2016-04-30 05:27:14 -05:00
Cheridan
718d80fa84 Merge pull request #17238 from optimumtact/patch-4 
Dead code trimming
 2016-04-30 05:25:49 -05:00
Cheridan
1dd607aa4c Merge pull request #17237 from optimumtact/patch-3 
bail out of findJoinDate when no server response
 2016-04-30 05:14:30 -05:00
Cheridan
7644c7f47c Merge pull request #17235 from optimumtact/patch-1 
Prevent negative sqrts in dna heal
 2016-04-30 04:21:15 -05:00
KorPhaeron
1a18d00fe1 No more mindswapping with bosses 2016-04-30 02:22:43 -05:00
KorPhaeron
f4f6a64a1c Fixes Dragon Log Spam 2016-04-30 02:03:30 -05:00
Jordie
53fd10c54b Merge pull request #17256 from tgstation/revert-17086-planes_on_a_snake 
Revert "Move some stuff from different layers to different planes"
 2016-04-30 15:34:17 +10:00
Nerd Lord
03e8f0da61 if you see something say nothing and drink to forget 2016-04-29 23:06:53 -04:00
Nerd Lord
8ef63673d5 if you see something say nothing and drink to forget 2016-04-29 22:14:04 -04:00
Nerd Lord
8a6d36061e Each cable coil color now has inhands 2016-04-29 22:10:11 -04:00
Cheridan
d662b0e455 Merge pull request #17218 from phil235/FixTalkingInPipes 
No longer deaf while inside pipes
 2016-04-29 20:34:03 -05:00
KorPhaeron
8964eaebb7 Merge pull request #17259 from Core0verload/tools.dmi 
Moves tools from items.dmi to tools.dmi
 2016-04-29 20:31:29 -05:00
Cheridan
34dd0e5b02 Merge pull request #17018 from KorPhaeron/megafauna 
Megafauna
 2016-04-29 20:27:21 -05:00
c0
846d419b30 Moves tools from items.dmi to tools.dmi 2016-04-30 04:12:12 +03:00
KorPhaeron
5a09b7f8d9 Knocking sound 2016-04-29 19:43:22 -05:00
KorPhaeron
209a3d3e8e Legion is behind the door 2016-04-29 19:42:20 -05:00
KorPhaeron
eecd2942b3 Fixes dragon spamming explosion logs 2016-04-29 17:13:34 -05:00
KorPhaeron
0bbcc00c4d Revert "Move some stuff from different layers to different planes" 2016-04-29 16:07:23 -05:00
KorPhaeron
7c1c35e6d8 Merge pull request #17250 from tgstation/duncathan-patch-1 
this should deal with those pesky atmos runtimes
 2016-04-29 15:38:25 -05:00
KorPhaeron
323d340a9e Merge pull request #17216 from phil235/FixAlienStructureProjDodge 
Fix bundle: alien structure and forcedodge projectile
 2016-04-29 15:21:56 -05:00
duncathan salt
c3b91d6e86 fixes #17248 2016-04-29 13:32:35 -06:00
phil235
7900f80544 Merge branch 'master' of https://github.com/tgstation/-tg-station into FixAlienStructureProjDodge 
Conflicts:
	code/game/objects/structures/aliens.dm
 2016-04-29 20:58:02 +02:00
Cheridan
4a6358ae87 Merge pull request #17213 from phil235/FixMorphHarvest 
Fixes butchering a morph not dropping anything.
 2016-04-29 13:57:23 -05:00
phil235
b1c1925b7c Change gib animation sprites to only loop once. 2016-04-29 20:48:56 +02:00
Cheridan
48924d957e Merge pull request #17107 from Core0verload/botany_nerf 
Nerfs botany Potency gene extraction
 2016-04-29 13:38:36 -05:00
Cheridan
02614f8175 Merge pull request #17207 from phil235/FireAlarmBreakFix 
Fixes being able to break fire alarms
 2016-04-29 13:34:53 -05:00
Joan Lung
6fc1d4fde4 Blobs can no longer eat the supermatter (#17205) 
* Blobs can no longer eat the supermatter

* phil'd

* phil'd
 2016-04-29 20:29:20 +02:00
Cheridan
1e0c5acd1f Merge pull request #17211 from phil235/FixThermiteBorg 
Fix bundle: borg module, thermite, chairs
 2016-04-29 13:22:50 -05:00
Mercenaryblue
7601144eb7 Paper Planes Mk2 (#17058) 
Adds Paper Planes
 2016-04-29 19:17:36 +02:00
Razharas
ae78dd582a Merge pull request #17208 from phil235/FixMechaMaskToxin 
Fix bundle and mech melee attack animation
 2016-04-29 19:32:38 +03:00
KorPhaeron
29baead8a5 Merge pull request #17165 from Incoming5643/no_cat_cucks 
Fixes? Catsploision? [Maybe?]
 2016-04-29 11:18:24 -05:00
Remie Richards
a5ec86da08 vote improvements 
Lets admins skip vote wait (so long as one isn't in progress), gives feedback to people who try to start a vote too soon.
 2016-04-29 17:17:49 +01:00
Razharas
d8232cbf33 Revert "Adds player preference to hide irrelevant tablecraft recipes" 2016-04-29 17:47:31 +03:00
Joan Lung
2bd45f793b Merge pull request #17239 from Core0verload/nanofix 
One symbol fix
 2016-04-29 10:23:35 -04:00
Remie Richards
ddb1dacb0c Merge pull request #17234 from tgstation/duncathan-patch-1 
Fixes superconduction runtimes
 2016-04-29 14:52:56 +01:00
KorPhaeron
315c6619f4 Merge pull request #17193 from TechnoAlchemisto/belttweak 
Tweaks some storage issues with the explorer belt.
 2016-04-29 08:50:01 -05:00
KorPhaeron
b6bdc66e30 Merge pull request #17192 from Incoming5643/I_was_feeling_down_so_heres_some_magic 
Buffs the staff/wand of door creation
 2016-04-29 08:27:49 -05:00
Razharas
d059510b88 Merge pull request #17194 from MrStonedOne/patch-191 
Adds some logging to hard deletes that take forever.
 2016-04-29 16:10:03 +03:00