coffeeshits/kiwistation
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
31,164 Commits 9 Branches 11 Tags
dbd01d8a43e0967ffd7bb17cd910238df8753fb9
Commit Graph

4458 Commits

Author SHA1 Message Date
Swag McYolosteinen d8c588867a Merge pull request #8634 from sawu-tg/master 
See #7217
 2015-03-31 19:40:33 +02:00
MrPerson d6be5a2e1b Move time for lighting changes from a scale to a fixed length 
PDA's start off again, but the code is still there.
forceMove() now calls Moved() and has some other minor tidying up. This means teleporting will update the lights around you right away.
 2015-03-31 05:09:46 -07:00
MrPerson e4a3abdd70 Object based lighting system 
Uses actual objects on each non-space, dynamically lit turf. Light levels are switched back and forth via animate() and the object's alpha. Supporting colors shouldn't be too hard. Some hacky efficiency improvements means it isn't that much more expensive than current (I think, needs testing). Most of the lighting ss's cost is in checking all the lights and doing big loops, not anything actually in the loops themselves.

Start PDA flashlights on. This was to speed up testing but frankly I think it's a good change in general.

Added a Moved() proc. Called after a successful move.

In the future I hope to move off the luminosity var entirely but that was too slow in testing for me. That's what all that "for(area in sortedAreas) area.luminosity = 1" stuff in the lighting ss is, tests on removing luminosity outright.
 2015-03-31 05:09:42 -07:00
ACCount12 f10d0df8cf Merge remote-tracking branch 'origin/master' into mining 2015-03-31 18:31:12 +12:00
ACCount12 1c219f0ebe A lot of stuff 2015-03-31 18:30:09 +12:00
Cheridan 9606763e5f Merge pull request #8583 from Fayrik/CentcomExpansion 
Centcom Two: It's better now, I swear.
 2015-03-30 21:35:19 -05:00
phil235 0cef9e5539 Merge pull request #8198 from Xhuis/cigar_cases 
Adds cigar cases
 2015-03-30 18:47:46 +02:00
Sawu bfd0436324 See #7217 
* Spraycans are given to Revheads
* Spraycans act as instant use crayons.
* Spraycans can be used on walls.
* Spraycans can be used as ghetto pepper spray, but leave the target with a coloured face (can be removed with space-cleaner)

(Old pictures, there is now only one can that changes color)

![can1](https://cloud.githubusercontent.com/assets/3829126/5812999/c3992e38-a0c9-11e4-8620-3e1ecbc97630.PNG)
![can2](https://cloud.githubusercontent.com/assets/3829126/5813002/c92d56d0-a0c9-11e4-8592-6ae15f594ca8.PNG)
![cap3](https://cloud.githubusercontent.com/assets/3829126/5825994/88a9260a-a143-11e4-8cd7-cd4491b0db2a.PNG)
![can4](https://cloud.githubusercontent.com/assets/3829126/5828055/28766ffc-a154-11e4-8bfb-f8475c84c6a4.PNG)
 2015-03-31 02:26:05 +11:00
Fayrik 9b834fca7a Look at all these bugs that no longer exist! 2015-03-30 03:36:24 +01:00
Cheridan 884e9e3774 Day Who-Knows: Bar Gambling Expansion! 
Space cash is stacks
Adds dealer table to map
 2015-03-29 18:09:54 -05:00
Jordie 8113c2a1f0 Merge pull request #8483 from xxalpha/c4fix 
Fixes the C4 being planted on the DA.
 2015-03-30 01:21:52 +11:00
Jordie c8e0c16d09 Merge pull request #8520 from MrPerson/effect_cleanup 
Effect pooling
 2015-03-30 01:21:40 +11:00
Fayrik 7336e6ecb8 Call Centcom! ERTs got fixed! 2015-03-29 03:54:54 +01:00
Fayrik 4f43fff199 Issue fixes! All that, and more! 2015-03-29 03:54:41 +01:00
Xhuis d209ce5235 Merge remote-tracking branch 'remotes/upstream/master' into stealthy_weapons 2015-03-28 14:42:31 -04:00
Xhuis 2c988e0aea Adds pizza bomb traitor item 2015-03-28 12:45:05 -04:00
xxalpha 55b81363cc Merge remote-tracking branch 'upstream/master' into hardjet 
Conflicts:
	code/modules/clothing/spacesuits/hardsuit.dm
 2015-03-27 19:35:10 +00:00
Cheridan cb23548768 Merge pull request #8533 from Jordie0608/greatpermitsbringgreatweightresponsibility 
Fixes #8527, construction permit weight
 2015-03-27 14:04:38 -05:00
Cheridan 17067d9021 Merge pull request #8508 from phil235/SlimeAnimal 
Life refactor and slime as animal
 2015-03-27 13:38:16 -05:00
Jordie0608 1fc89cb611 removes soh singulo interaction 2015-03-26 13:19:56 +11:00
Jordie a86b757d93 Merge pull request #8291 from Xhuis/nerf_thermal_vision 
Nerfs changeling augmented eyesight
 2015-03-26 13:01:25 +11:00
phil235 1b3eb49a1d Merge branch 'master' of https://github.com/tgstation/-tg-station into SlimeAnimal 
Conflicts:
	code/modules/mob/living/carbon/human/human.dm
	code/modules/mob/living/carbon/slime/slime.dm
	code/modules/mob/living/simple_animal/slime/say.dm
 2015-03-26 02:31:06 +01:00
hornygranny e92fe6c333 Merge pull request #8495 from dannno/hahaobjectionxd 
adds hammer and gavel
 2015-03-25 16:13:39 -07:00
Jordie0608 a6a9aa8a89 adds some sanity checks 2015-03-25 18:03:48 +11:00
Jordie0608 a5396f320a confirmation check for boh bombing + soh also makes singulo 2015-03-25 17:29:43 +11:00
Jordie0608 461ea87bdc construction permit's w_class to 1 2015-03-25 16:52:09 +11:00
Jordie 0e57fc6941 Merge pull request #8488 from Miauw62/whatsthedifferenceanyway 
Adds a verb_exclaim var. Fixes #8478.
 2015-03-25 16:31:16 +11:00
Jordie ff90e1599c Merge pull request #8320 from AnturK/headcrabs 
Adds Headcrabs!
 2015-03-25 16:31:00 +11:00
Jordie 9a217503aa Merge pull request #8451 from Fayrik/FoamForceFuckYeah 
Foam force fuck yeah!
 2015-03-25 16:30:42 +11:00
Jordie fde0eecce8 Merge pull request #8456 from MrPerson/im_the_music_meisteeeeeeeeeeeeeer 
Instrument tweaks
 2015-03-25 16:29:29 +11:00
Jordie 0cbcda509d Merge pull request #8448 from AnturK/gothisway 
Adds arrow graffiti
 2015-03-25 16:29:15 +11:00
dannno a37ac1d600 warning span for gavel 2015-03-24 22:53:11 -04:00
MrPerson b6c71dc50d Effect pooling 
obj/effect/effect all pool themselves.
PoolOrNew() can now be passed a type and a list instead of a type and a location. In that case, the list will be passed to New() via arglist().
RCD's now delete their spark system and properly garbage collect.
 2015-03-24 11:44:49 -07:00
AnturK eadfecd552 - Makes body_egg parent for alien embryos/changeling eggs 2015-03-24 17:54:20 +01:00
Jordie 59af7cfd42 Merge pull request #8323 from Mandurrrh/miningborgupgrade 
Adds a cyborg upgrade module for the satchel of holding.
 2015-03-24 16:40:52 +11:00
hornygranny b73dd39854 Merge pull request #8436 from phil235/VendMachineCoinItemsFix 
Fixes vending machines starting with no coin or hacked items.
 2015-03-23 16:33:26 -07:00
phil235 ffd711c26f Merge branch 'master' of https://github.com/tgstation/-tg-station into SlimeAnimal 
Conflicts:
	code/modules/mob/living/carbon/life.dm
	code/modules/mob/living/carbon/slime/slime.dm
	code/modules/mob/living/simple_animal/friendly/corgi.dm
	code/modules/mob/living/simple_animal/slime/say.dm
	code/modules/reagents/Chemistry-Reagents/Consumable-Reagents/Food-Reagents.dm
 2015-03-23 16:51:03 +01:00
dannno 365c36c1e0 repair gavel syntax 2015-03-22 20:36:10 -04:00
dannno 3254142b21 adds hammer and gavel 2015-03-22 20:22:27 -04:00
Miauw ba2a1c8f19 Adds a verb_exclaim var. Fixes #8478. 
Also makes saymods transmitted through the radio system for upcoming NTSL integration.
 2015-03-22 18:55:59 +01:00
xxalpha 973f374276 Fixed the C4 being planted on the DA. 2015-03-22 16:26:58 +00:00
Xhuis 7f6871c233 Fixes conflicts and commits 2015-03-21 12:47:25 -04:00
Fayrik 0173c7af6e Adds everything and makes it all work perfectly. It's like I'm almost good at this or something. (Seriously, points of interest: Secbots react to being shot. Dart rigging. Donksoft guns.) 2015-03-21 16:18:32 +00:00
Razharas 2271499db7 Merge pull request #8058 from Iamgoofball/explosive 
GOONCHEM 5: Pyrotechnics are finished, Toxins mostly complete
 2015-03-21 09:54:11 +03:00
Jordie 5d1155e09e Merge pull request #8435 from Zelacks/ChemImplantGuiFix 
Chemical implant action button fix
 2015-03-21 17:25:08 +11:00
Remie Richards 819422bc3e Merge pull request #8410 from Miauw62/yesgunhogimrewritinggoofsay 
MIAUW VON SAYCODE 3: RISE OF THE SPANS
 2015-03-21 05:05:37 +00:00
MrPerson fa7a89b25b Instrument tweaks 
The piano will stop playing once you walk away from it or get stunned.

The song BPM of the piano and violin will generally speaking be wrong because of discrepancies between the sleep between notes and world.tick_lag. I've solved this by locking BPM to points where the stated BPM will actually be the case because tempo == world.tick_lag.

Example
Current:
song @ 5 tempo - 120 BPM: c, c/2, c -> note -> sleep(5) -> 6 ticks (5.4 time passes) -> note -> sleep(2.5) -> 3 ticks (2.7 time passes) -> note.

With this PR:
song @ 5.4 tempo - 111 BPM: c, c/2, c -> note -> sleep(5.4) -> 6 ticks (5.4 time passes) -> note/2 -> sleep(2.7) -> 3 ticks (2.7 time passes) -> note.

I was hoping this would make the damn things sound better but then I realized it wasn't actually messing anything up. Oh well.
 2015-03-20 20:40:36 -07:00
Fayrik b758992e8c First (of probably several) commits to add Foam Force toy guns. Adds the new guns and crossbow, removes the old crossbow, and makes these new guns available to cargo. 2015-03-20 23:02:53 +00:00
AnturK 97ed18abfa - Adds arrow graffiti 2015-03-20 19:41:59 +01:00
phil235 aecb365f84 Merge branch 'master' of https://github.com/tgstation/-tg-station into SlimeAnimal 
Conflicts:
	code/modules/mob/living/carbon/alien/life.dm
	code/modules/mob/living/carbon/life.dm
	code/modules/mob/living/carbon/slime/slime.dm
	code/modules/mob/living/silicon/robot/life.dm
	code/modules/mob/living/simple_animal/slime/life.dm
 2015-03-20 19:32:16 +01:00