cyberpresidentvanellope/fulpstation
1
0
Fork 0
mirror of https://github.com/fulpstation/fulpstation.git synced 2025-12-10 10:01:40 +00:00
Code Issues Packages Projects Releases Wiki Activity
15,436 Commits 2 Branches 11 Tags
678a13c45187e80c1720e62a701c98fa466f1cdf
Commit Graph

6706 Commits

Author SHA1 Message Date
Hornygranny
678a13c451 moves emag effects from attackby() into atom proc emag_act() 2014-11-20 17:49:06 -08:00
hornygranny
b2fba4a48f Merge pull request #5944 from Jordie0608/orangeslikesgoatbutts 
Fixes select job equipment cancel
 2014-11-20 11:21:13 -08:00
Cheridan
a1efd6cfde Merge pull request #5946 from tkdrg/tktp 
Fixes TK teleporting pictures and growns
 2014-11-20 13:05:11 -06:00
Cheridan
0da09e3f6b Merge pull request #5557 from Incoming5643/magicmania1.76 
Magic Mania 1.76: Lets outrun the feature freeze
 2014-11-20 09:07:41 -06:00
Cheridan
8bfed4258b Merge pull request #5922 from Steelpoint/BeretHoS 
HoS Beret + Warden Drill Hat
 2014-11-19 10:26:27 -06:00
Cheridan
1208c48af3 Merge pull request #5652 from Menshin/atmos_z_level_fix 
Atmos z level fix + radio controller code sanitization
 2014-11-18 17:05:14 -06:00
Cheridan
c98448b5c2 Merge pull request #5650 from phil235/MechAtkFix1 
All mechs get a melee attack
 2014-11-18 12:53:52 -06:00
tkdrg
0db30a6534 Fixes issues with TK teleporting pictures and harvested plants. 2014-11-18 15:49:03 -03:00
Jordie0608
ce6a1d0d89 Fixes select job equipment cancel 2014-11-18 22:50:33 +11:00
Razharas
87fe5489a7 Merge pull request #5701 from tkdrg/outoftheleftfield 
Containment fiels bounce structure, machinery & mechs, take two
 2014-11-18 04:39:48 +03:00
Razharas
59aa177af7 Merge pull request #5681 from Menshin/singulo_beacon_fix 
Singularity beacon fix and clean-up
 2014-11-18 04:19:00 +03:00
hornygranny
1111c9caa7 Merge pull request #5915 from tkdrg/hugs 
Fixes a couple facehugger bugs
 2014-11-17 11:38:57 -08:00
Cheridan
53d913bc7f Merge pull request #5924 from tkdrg/junk 
Removes unticked unused code from the tree
 2014-11-17 13:34:49 -06:00
Remie Richards
2138e1d2c7 Merge pull request #5884 from tkdrg/ionblastUSA 
Moves the ion law picklists to an external txt
 2014-11-17 09:48:04 +00:00
tkdrg
608dec814e Removes old/unused code from the tree. Use version control if you need it for some reason. 2014-11-16 16:53:18 -03:00
Steelpoint
03a98a6295 HoSBeret 2014-11-16 22:32:01 +08:00
tkdrg
e05dbe3b27 Fixes facehuger bugs 2014-11-16 03:26:27 -03:00
hornygranny
509c07650f Merge pull request #5802 from paprka/EATITFATTY 
Clothing sprite/file path changes
 2014-11-15 20:28:43 -08:00
hornygranny
ac6d5b9558 Merge pull request #5861 from tkdrg/moarfloors 
Floor refactor MkII
 2014-11-15 20:13:50 -08:00
Incoming
4a4b39b57f fixes the spider pathing 2014-11-15 14:55:48 -05:00
Incoming
fbbc77f905 Merge branch 'master' of https://github.com/tgstation/-tg-station into magicmania1.76 
Conflicts:
	code/modules/projectiles/projectile/magic.dm
 2014-11-15 14:44:51 -05:00
Razharas
24c0c3d941 Merge pull request #5889 from Aranclanos/phazonchassis 
Fixes phazon chassis availability in the mech fabricator
 2014-11-15 20:39:36 +03:00
Razharas
2ec1658be0 Merge pull request #5735 from phil235/StingMiddleClickRuntimeFIx 
Moving carbon/middleclickon() form carbon.dm to click.dm
 2014-11-15 02:51:24 +03:00
Cheridan
8202db4227 Merge pull request #5755 from Miauw62/bughl 
Fixes grinders opening their menus on range.
 2014-11-14 14:50:46 -06:00
Remie Richards
2f57a8980a Merge pull request #5804 from TZK13/Preferences-Setup-Fixes-2 
Fixes the previews in the character setup screen again
 2014-11-14 18:29:17 +00:00
tkdrg
77a6df36f7 Merge remote-tracking branch 'upstream/master' into moarfloors 
Conflicts:
	_maps/map_files/MetaStation.v39K.dmm
	_maps/map_files/MiniStation/MiniStation.dmm
	_maps/map_files/tgstation.2.1.3.dmm
	code/game/machinery/bots/floorbot.dm
 2014-11-14 15:23:35 -03:00
Remie Richards
935775bfc1 Merge pull request #5788 from Miauw62/runtime2 
Fixes some AI traitorize runtimes.
 2014-11-14 18:12:50 +00:00
Remie Richards
17607d0aa2 Merge pull request #5776 from MrPerson/throwing_changes 
Throwing bugfixes
 2014-11-14 18:04:00 +00:00
Aranclanos
02d18de52a Fixes phazon chassis availability in the mech fabricator, they were missing. 2014-11-14 14:45:38 -03:00
Menshin
ec944abfc6 * limit atmos/fire alerts to the current z_level 
* atmos/fire alerts are now linked to an object and not its area, as intended
* simplified and full pathed the radio frequency datum
* made radio objects properly clean on del/qdel, instead of letting the radio controller remove nulls at each post_signal()
 2014-11-14 10:10:45 +01:00
paprka
bf20961a41 fixes a grammarical error 2014-11-13 21:13:55 -08:00
paprka
ec6b2424d2 purge the unused 2014-11-13 21:10:53 -08:00
paprka
40cdf3ffec swat mask overhauls and such 2014-11-13 18:36:30 -08:00
Cheridan
864692abad Merge pull request #5813 from paprka/suicideviaborg 
Gives borgs appropriate module-based flashlights
 2014-11-13 19:56:15 -06:00
Cheridan
24456bcc22 Merge branch 'PipenetRevamp' of https://github.com/Aranclanos/-tg-station into Aranclanos-PipenetRevamp 
Conflicts:
	_maps/map_files/tgstation.2.1.3.dmm
	code/ATMOSPHERICS/atmospherics.dm
	code/ATMOSPHERICS/components/portables_connector.dm
 2014-11-13 18:55:53 -06:00
Cheridan
37081d444e Merge pull request #5744 from tkdrg/ihatelife 
Cleans up Life() a little bit
 2014-11-13 17:48:18 -06:00
Cheridan
38eeca2ebd Merge pull request #5644 from Jordie0608/beekeepermodewhen 
Adds bee swarms and butterflies and diseases to create them
 2014-11-13 17:04:29 -06:00
tkdrg
47efa898df Ion strings moved to external txt. Credits to volundr @ goonstation for the idea and the contents of _string_lists.dm 2014-11-13 19:59:20 -03:00
phil235
fce8781994 Merge branch 'master' of https://github.com/tgstation/-tg-station into StingMiddleClickRuntimeFIx 
Conflicts:
	code/modules/mob/living/carbon/carbon.dm
 2014-11-13 17:44:09 +01:00
phil235
a005055cf3 Merge branch 'master' of https://github.com/tgstation/-tg-station into MechAtkFix1 
Conflicts:
	code/modules/mob/living/carbon/human/human_defense.dm
	code/modules/mob/living/living_defense.dm
 2014-11-13 17:17:23 +01:00
tkdrg
ed4c03b099 Floor cleanup: Repaths /turf/simulated/floor to /turf/simulated/floor/plasteel 
Repaths carpet and grass to /turf/simulated/floor/fancy/carpet and /turf/simulated/floor/fancy/grass
Cleans up a few floor procs
 2014-11-12 22:50:32 -03:00
hornygranny
f00d32abc1 Merge pull request #5803 from Menshin/sleeping_in_closets 
Removes hilarious but useless sleep() in closets/boxes creation
 2014-11-11 10:55:07 -08:00
Cheridan
242ec7e54c Merge pull request #5742 from Menshin/Maploader_fix 
Maploader fix
 2014-11-11 10:16:39 -06:00
hornygranny
ace3848ed8 Merge pull request #5801 from tkdrg/spessspeed 
Speeds up space movement a little bit
 2014-11-10 20:19:54 -08:00
paprka
6c05cd3fef gave borgs better icons for their hailer recordings 2014-11-10 12:12:41 -08:00
paprka
2a8c3b83c6 updates sec hailer to have proper flags 2014-11-10 12:08:45 -08:00
paprka
3fb5d14468 Merge branch 'master' of https://github.com/tgstation/-tg-station into EATITFATTY 
Conflicts:
	icons/mob/items_lefthand.dmi
	icons/mob/items_righthand.dmi
	icons/mob/suit.dmi
 2014-11-10 11:43:46 -08:00
paprka
057482c64b gives borgs appropriate module-based flashlights 2014-11-10 10:54:35 -08:00
hornygranny
d4a5d2ba1f Merge pull request #5786 from Miauw62/runtime1 
Fixes some RD console runtimes.
 2014-11-10 08:43:10 -08:00
hornygranny
aa888ada65 Merge pull request #5753 from tkdrg/signalerruntime 
Fixes #5604 signaler runtime
 2014-11-10 08:20:10 -08:00