Commit Graph

14175 Commits

Author SHA1 Message Date
Iamgoofball
ce7c2e13ff Changes Spellbook can't open text 2015-02-04 18:55:34 -08:00
Iamgoofball
2098fd5ea5 Fixes #7497 2015-02-04 18:53:33 -08:00
Iamgoofball
9a1036d43b Fixes #6991 2015-02-03 20:26:58 -08:00
Iamgoofball
d0b51e86ed fixes #7154 2015-02-03 19:09:18 -08:00
Iamgoofball
a480ffbc98 whole lotta bugfixes 2015-02-03 17:57:57 -08:00
Iamgoofball
fa7e15d734 what is object oriented programming 2015-02-02 18:30:24 -08:00
Iamgoofball
1f7ef9b218 Fixes #7020 2015-02-01 13:58:07 -08:00
Swag McYolosteinen
920bca9147 Merge pull request #7358 from Delimusca/gooeyfun
Minor slime enhancements
2015-02-01 14:04:52 +01:00
Swag McYolosteinen
ad8898d154 Merge pull request #7406 from Menshin/send_back_to_lobby
Added a "Send back to Lobby" option in Player Panel
2015-02-01 12:50:55 +01:00
Swag McYolosteinen
d03ef74ebc Merge pull request #7430 from Menshin/shuttle_underlays_fix
Shuttle related fixes
2015-02-01 12:46:46 +01:00
Swag McYolosteinen
d5ccc9cffe Merge pull request #7436 from Incoming5643/WaitingForTheSun
Fixes #6885
2015-02-01 12:46:16 +01:00
Swag McYolosteinen
bc8b506185 Merge pull request #7463 from Incoming5643/indentationmatters
Fixes an incorrect indentation that was leaving invisible comatose mobs all over the place
2015-02-01 12:45:40 +01:00
Razharas
c0abee10a3 Merge pull request #7462 from Iamgoofball/patch-26
Fixes #7458
2015-02-01 10:26:08 +03:00
Razharas
452494aaa4 Merge pull request #7452 from Iamgoofball/patch-22
Fixes #7409
2015-02-01 10:06:46 +03:00
Remie Richards
b1ff5dd6de Merge pull request #7418 from paprka/kekwalk
Some catwalk fixes
2015-02-01 03:32:43 +00:00
paprka
59d4070f8a removes blob changes 2015-01-31 19:26:35 -08:00
hornygranny
bf09400b16 Merge pull request #7451 from phil235/CprLogTypo
Fixes typo in CPR logs that switched attacker and victim.
2015-01-31 14:06:18 -08:00
Remie Richards
c09bd7707b Merge pull request #7435 from dannno/dufflefix
fixes dufflebag max weight class
2015-01-31 19:49:37 +00:00
Swag McYolosteinen
3b05215996 Merge pull request #7437 from Incoming5643/wonderment
New contraband supply item: 50 butterflies
2015-01-31 18:07:29 +01:00
Deantwo
8818d4fce4 Fixes strip_html_properly infinite loop
><
2015-01-31 12:59:14 +01:00
Incoming
1610303826 Indentation is the keye 2015-01-31 01:38:39 -05:00
Iamgoofball
77562ab06a Fixes #7458
Fixes #7458
2015-01-30 22:23:57 -08:00
Iamgoofball
920c730b8e Fixes #7409
Fixes #7409
2015-01-30 16:09:55 -08:00
phil235
b4324a2db4 Fixes typo in CPR logs that switched attacker and victim. 2015-01-30 22:16:48 +01:00
Cheridan
2716046e09 Merge pull request #6817 from Perakp/speed_tweak
Cold temperatures slow you down even when there is no gravity.
2015-01-30 14:45:27 -06:00
Cheridan
9eb4e67d58 Merge pull request #7412 from paprka/capwazer
adds unique inhands for the captain's laser
2015-01-30 14:07:12 -06:00
Incoming
c8e3b33687 (。´>д<)っ彡☆
Y'all making me do actual refactoring in a silly pull
2015-01-29 18:59:25 -05:00
Incoming
b5ec328983 New contraband supply item: 50 butterflies
(◕‿◕✿)
2015-01-29 18:07:34 -05:00
Incoming
31b84ca71f changes how the bolt of door creation works so it behaves expectedly on shuttles
adds butterflies to the staff/wand of change/polymorph since I'm here.

Removes two colons
2015-01-29 16:30:31 -05:00
dannno
d47f6334c3 fixes dufflebag max weight class 2015-01-29 16:05:33 -05:00
Menshin
6c03fcf5e8 Added a "interior" subtype for shuttle wall that doesn't add an overlay of the destination turf on shuttle move 2015-01-29 20:41:22 +01:00
hornygranny
f7659eb4e5 Merge pull request #7426 from Miauw62/ye_olde_bugfix
fixes MMI and pAI teleporting
2015-01-29 10:51:12 -08:00
Swag McYolosteinen
eafdaae185 Merge pull request #7393 from GunHog/WhyDidYouBorgTheClown
More Silicon Emotes!
2015-01-29 19:06:19 +01:00
Swag McYolosteinen
3bb7213d14 Merge pull request #7346 from paprka/hoodshit
New hood/hardsuit helmet system
2015-01-29 18:57:25 +01:00
Miauw
b6b17e214f After-merge cleanup. 2015-01-29 18:51:31 +01:00
Miauw
e1d3799f9d Removes a debug message. 2015-01-29 18:50:51 +01:00
Miauw
04ad06eca0 Fixed #126. MMIs and pAIs can now be teleported properly.
Revamped the AI get/jump procs to use admin_forcemove(), which makes sure that mobs are moved by setting various vars and then calling Move().
2015-01-29 18:50:48 +01:00
Swag McYolosteinen
30d62a89a8 Merge pull request #7396 from Menshin/supply_comp_contraband_fix
Fixes supply computers not been able to order contraband
2015-01-29 18:42:37 +01:00
Swag McYolosteinen
ea7c58e4a0 Merge pull request #7403 from Deantwo/ChemDispUiFix
Chemical Dispenser and ChemMaster fixes
2015-01-29 18:42:25 +01:00
Swag McYolosteinen
697c79e99c Merge pull request #7387 from Delimusca/foamfun
foam armblade toy
2015-01-29 18:28:58 +01:00
Swag McYolosteinen
975ebd7d65 Merge pull request #7363 from Xhuis/changeling_abilities
Adds two new changeling abilities
2015-01-29 18:27:49 +01:00
paprka
1e9d1cf278 Merge branch 'master' of https://github.com/tgstation/-tg-station into kekwalk
Conflicts:
	_maps/map_files/TgStation/tgstation.2.1.3.dmm
2015-01-28 19:36:13 -08:00
paprka
ac85775b02 catwalk fixes 2015-01-28 19:30:21 -08:00
Delimusca
3e796d843b fixed foam armblade name 2015-01-28 18:22:13 -07:00
paprka
e5b4a32cc4 adds unique inhands for the captain's laser 2015-01-28 16:37:03 -08:00
GunHog
2920aa3aa9 Adds the new emotes to the help emote display. 2015-01-28 16:39:25 -06:00
hornygranny
02630dcb45 Merge pull request #7379 from Menshin/jump_to_area_fix
Jump_to_area bugfixing
2015-01-28 14:33:59 -08:00
Xhuis
057a420139 Reduces DNA costs of both abilities 2015-01-28 16:53:40 -05:00
Menshin
9af151878d Added a "Send back to Lobby" option in Player Panel. 2015-01-28 18:45:26 +01:00
Cheridan
46f588b424 Merge pull request #7334 from Xhuis/portable_console_in_belt
Lets you store handheld crew monitors in medical belts
2015-01-28 09:41:04 -06:00