coffeeshits/kiwistation
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
15,056 Commits 9 Branches 11 Tags
09984d5ee0a9159bb0bc7d96e4a62a2d81bb4607
Commit Graph

3600 Commits

Author SHA1 Message Date
hornygranny b8f0ef4efe Merge pull request #5541 from xxalpha/cigarettes 
New Cigarette Packs
 2014-11-03 18:49:29 -08:00
hornygranny 05539c7d13 Merge pull request #5382 from TZK13/Asteroid-Toy 
Adds new meteor toys and space carp plushies to arcade machines
 2014-11-03 18:39:16 -08:00
Cheridan df13b0d840 Merge pull request #5591 from hornygranny/OOPgularity3 
improved deconstruction, singularity stuff
 2014-11-03 20:20:55 -06:00
hornygranny d5b8ed3155 Merge pull request #5460 from paprka/rdturtle 
Adds RD turtleneck and updates whimsy
 2014-11-03 18:18:18 -08:00
hornygranny e662932bd1 Merge pull request #5512 from RemieRichards/AcidBurns 
Acid Rework
 2014-11-03 18:11:49 -08:00
paprka 1b6eb8afec Merge branch 'master' of https://github.com/tgstation/-tg-station into defibsfinal 
Conflicts:
	_maps/map_files/tgstation.2.1.3.dmm
 2014-11-03 17:57:40 -08:00
hornygranny de22ca7aac Merge pull request #5354 from optimumtact/patch-1 
Remove click delay from pipe painter and adds adjacency check
 2014-11-03 17:44:29 -08:00
hornygranny d81eb696c4 Merge pull request #5570 from xxalpha/noslipfloor 
High-traction Floor
 2014-11-03 17:37:20 -08:00
hornygranny bf9679d6cb Merge pull request #5581 from tkdrg/spacefactory13 
Constructable conveyor belts!
 2014-11-03 17:33:32 -08:00
hornygranny 8b4ab665cb Merge pull request #5490 from tkdrg/hiasl 
Nanotransen Relay Chat
 2014-11-03 17:26:53 -08:00
hornygranny 7e4688e3f6 Merge pull request #5427 from paprka/littlejanitorthings 
Soap, lube, and janitor tweaks
 2014-11-03 17:19:37 -08:00
hornygranny b32e9cff12 Merge pull request #5621 from tkdrg/damnoldcoders 
Moves around some vars
 2014-11-03 17:15:54 -08:00
hornygranny fa4fa09149 Merge pull request #5569 from Menshin/runtimes_roundsup 
Alek2ander weekly runtimes fixing
 2014-11-03 17:13:18 -08:00
hornygranny 6e11157661 Merge pull request #5520 from paprka/minerscrubs 
Improves mining equipment prices, rebalances medipens
 2014-11-03 17:12:02 -08:00
hornygranny 0a0cd991de Merge pull request #5516 from paprka/telestunfix 
fixes telebaton stunning borgs
 2014-11-03 17:11:39 -08:00
hornygranny 85016d7f38 Merge pull request #5493 from tkdrg/pullingyourleg 
Makes pull into a mob verb
 2014-11-03 17:10:34 -08:00
Remie Richards c1060d95b2 Merge branch 'master' of https://github.com/tgstation/-tg-station into AcidBurns 
Conflicts:
	code/game/atoms.dm
	code/game/objects/items.dm
 2014-11-03 19:38:58 +00:00
Hornygranny 4cfa4ec04b windows break at stage 5 2014-11-03 11:37:08 -08:00
Cheridan a28abaf72a Merge pull request #5544 from MrPerson/jesus_shut_up_aran_god_damn 
Make buckled mobs anchored if their chair is anchored
 2014-11-02 22:40:20 -06:00
Cheridan 6e29ad75d5 Merge pull request #5492 from tkdrg/nofunallowed 
You can no longer put transit tube pods in a station that already has one
 2014-11-02 11:56:20 -06:00
tkdrg 7ebc4bb742 Merge remote-tracking branch 'upstream/master' into pullingyourleg 
Conflicts:
	code/modules/mob/mob.dm
 2014-11-02 14:40:37 -03:00
Cheridan 51eae4c5a2 Merge pull request #5601 from phil235/ObjVerbCheckFix 
Adding checks for stun, restrained to many object verbs.
 2014-11-02 11:34:48 -06:00
Cheridan 71fe1bf00b Merge pull request #5597 from phil235/IdMsgFix 
Fix the 'show ID' message.
 2014-11-02 11:10:16 -06:00
tkdrg a97c4de972 Moves m_amt, g_amt, reliability and origin_tech to /obj/item (previously in /obj) 
Removes force from pipes
Removes unused turf var icon_old
Moves pass_flags to /atom/movable
 2014-11-02 14:10:03 -03:00
Cheridan 4f58312d76 Merge pull request #5596 from phil235/LipstickFix 
Fix for #5588
 2014-11-02 10:39:21 -06:00
Cheridan ef29aaef57 Merge pull request #5598 from phil235/PDAsoundFix 
Fix lack of sound when non-silent PDA receives a message.
 2014-11-02 10:26:28 -06:00
MrPerson 05b2146a7d Fix anchored issues with alien nests 
Because standardization is poison it seems
Also fix an issue where pixel_y could get permanently set to 6.
 2014-11-02 05:46:03 -08:00
tkdrg 30841b5f37 Merge remote-tracking branch 'upstream/master' into hiasl 
Conflicts:
	code/modules/research/message_server.dm
 2014-11-01 20:04:26 -03:00
Menshin 8202bde945 Even the damned statue !!! 2014-11-01 22:06:59 +01:00
Hornygranny b16ed90db1 Merge branch 'OOPgularity3' of https://github.com/hornygranny/-tg-station 2014-11-01 13:29:46 -07:00
paprka 97a89b1162 Stun proc punctuation and compile error fix 2014-11-01 11:32:50 -07:00
paprka 17ea3d8641 adds stun to emagged defib 2014-11-01 11:28:51 -07:00
paprka 52d99e64ca noclone check 2014-11-01 11:23:51 -07:00
paprka 6acd73c835 changes emagging, punctuation, and emag stun 2014-11-01 11:20:05 -07:00
phil235 128c9222e5 Adding checks for stun, restrained to many object verbs. 
Fixing paper and supply manifest description upon examination.
Fixing being able to adjust jumpsuit while restrained.
Fixing one typo.
 2014-11-01 19:18:01 +01:00
phil235 4803f099f6 Fix lack of sound when non-silent PDA receive message. 2014-11-01 15:32:48 +01:00
phil235 c8f3ad2dd0 Fix ID show message. 
Remove "Read ID card" object verb (because all the information it gave was already in the ID card's name.
Remove some old text( ) stuff.
 2014-11-01 15:17:43 +01:00
phil235 af767f2935 Fix being able to apply lipstick through masks and items covering the mouth. 2014-11-01 13:28:32 +01:00
Remie Richards 0bc683aa29 Merge pull request #5457 from GunHog/AI_Radio 
Adds AI Integrated Radio
 2014-11-01 03:44:44 +00:00
Hornygranny 955847de74 defines 2014-10-31 19:00:50 -07:00
Hornygranny 5815d7e011 grilles are now damaged by thrown items 
disposalpipes deconstruction
atmos pipes deconstruction
 2014-10-31 18:26:42 -07:00
Hornygranny c29526ee2f destruction proc, cable deconstruction 2014-10-31 17:01:28 -07:00
paprka df289b5c53 Merge branch 'master' of https://github.com/tgstation/-tg-station into defibsfinal 
Conflicts:
	_maps/map_files/tgstation.2.1.3.dmm
 2014-10-31 10:28:57 -07:00
paprka 393dcaade7 changes scrub spawn to one of each instead of RNG 2014-10-30 20:28:26 -07:00
paprka 389e0e1237 research design and origintech update 2014-10-30 19:21:58 -07:00
xxalpha b9f5947f5e High-traction Floor 2014-10-31 01:50:31 +00:00
Menshin 6176ee9f0f conflicts fixing 2014-10-31 02:43:00 +01:00
Menshin cce46b39eb Fixes runtimes related to clown_ore -> bananium changes (fixes #5554). 
Fixes runtimes related to security records (fixes #5552).
Changing the name in the security database now also change it in the general database.
 2014-10-31 02:30:34 +01:00
paprka 0296e7634a lots of debugging, ghost notifications work now 2014-10-30 17:32:19 -07:00
Hornygranny 9c95842adf Merge remote-tracking branch 'remotes/upstream/master' into OOPgularity2 
Conflicts:
	code/game/turfs/simulated/floor.dm
 2014-10-30 17:26:25 -07:00