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

269 Commits

Author SHA1 Message Date
KiwiFarms 9afe050025 Replaced last occurences of gc_destroyed by qdeleted(). 2016-03-05 01:58:56 +01:00
duncathan salt 8995062dbe add stack_trace() to unsorted.dm 2016-02-28 17:13:24 -06:00
xxalpha 1a4206c77b Merge remote-tracking branch 'upstream/master' into uhhhhh 2016-02-19 18:32:07 +00:00
xxalpha 569797531c Fixed map 2016-02-18 00:00:07 +00:00
xxalpha 1bee6b5365 Merge remote-tracking branch 'upstream/master' into uhhhhh 2016-02-17 15:04:51 +00:00
xxalpha 7c0c66dba3 Merge remote-tracking branch 'upstream/master' into urange 2016-02-17 14:21:29 +00:00
AnturK e93fbcd2a0 Cleanup 2016-02-10 16:30:43 +01:00
MrStonedOne 60d068e6fa Merge remote-tracking branch 'upstream/master' into patch-130 
Conflicts:
	code/__HELPERS/unsorted.dm
	code/game/objects/objs.dm
	code/modules/reagents/reagent_dispenser.dm
 2016-02-07 17:41:42 -08:00
MrStonedOne eef4f4d534 Optimizes tesla_zap, adds fuel tank tesla_act, misc tesla changes 2016-02-07 17:34:52 -08:00
tkdrg ffa51f8f0d Merge pull request #15162 from xxalpha/getareas 
Fixes wizarditis teleport
 2016-02-05 01:39:04 -03:00
xxalpha 0949e4d052 Moved proc to game.dm 2016-02-05 04:30:07 +00:00
Bjorn Neergaard 063dd9fb84 Get the code running on 510 
* Travis for 510
* Remove json, list2text, text2list, bygex
* Change blind and click catcher to a low plane
 2016-02-04 17:19:40 -06:00
xxalpha 9154e6cbf2 ultra range again 2016-02-03 07:58:41 +00:00
xxalpha 2bd13e700a get_areas_in_range() 
nospace

wormhole
 2016-02-03 07:10:34 +00:00
xxalpha 3f53f11d0c Now the event spawns mobs from lists of types. 2016-01-31 17:23:05 +00:00
xxalpha 3df42cfdba Added new event: portal storm. 
need the file of course

world name
 2016-01-30 01:23:55 +00:00
Firecage d82f970234 Merge conflict fix 2016-01-27 17:38:42 +02:00
Firecage 7f96592b87 Merge Conflict Fix 2016-01-27 13:29:38 +02:00
Razharas 20bcee4ec0 Further impovements to proximity code 
Further impovements to proximity code
Also voice analiser's third mode now remembers the voice properly not
just mob
 2016-01-26 21:18:48 +03:00
Razharas 6f8ce47951 New proximity code 
New proximity code
 2016-01-26 07:47:33 +03:00
Bjorn Neergaard f3697fc7d6 Repath air alarms 2016-01-25 12:02:58 -06:00
Cheridan b3240416b4 Merge pull request #14798 from MrPerson/come_on_guys 
Fixes some awful defines to not be hacks
 2016-01-24 21:15:14 -06:00
duncathan salt f56eec60fb Merge pull request #14809 from tkdrg/hurr_bugexploitingisfun 
[s]Fixes RPD/disposals exploits
 2016-01-24 13:43:41 -06:00
Tkdrg 773f0f7c21 Fixes RPD/disposals exploits 
Also removes a bit of copy-paste and speeds up a helper slightly.

Fixes #13473
Fixes #14654
 2016-01-24 16:23:20 -03:00
AnturK d2be78ab6c Refactors renaming a bit 2016-01-24 12:56:50 +01:00
AnturK 330684df11 Fixes constructed AI's not getting their preferred name 2016-01-24 12:56:03 +01:00
MrPerson e1b3815539 Fixes some awful defines to not be hacks 2016-01-22 19:07:37 -08:00
Bjorn Neergaard 1599742f7e Re-structure tgui's ui_act 2016-01-22 19:25:36 -06:00
Firecage d1327d4076 Merge conflict fix 2016-01-19 10:02:50 +02:00
Bjorn Neergaard aa8b6bfac2 Factor out radio helpers 2016-01-18 14:30:27 -06:00
Bjorn Neergaard 5cfc60d9da tgui radios; clean up frequency code 2016-01-18 14:28:33 -06:00
Firecage 0cb6814c18 Merge conflict fix 2016-01-17 19:15:30 +02:00
Firecage 332bde0f4f Does the rest of the if()'s/ else's 2016-01-17 19:03:12 +02:00
Firecage 754491ce4c Changes relatives paths into absolute paths and makes some if()'s better 2016-01-17 01:36:56 +02:00
duncathan 9066bc7c4f Merge branch 'master' of https://github.com/tgstation/-tg-station into listmos 
Conflicts:
	code/controllers/subsystem/air.dm
	code/datums/gas_mixture.dm
	code/game/objects/items/devices/scanners.dm
	code/modules/mob/living/carbon/human/species.dm
	code/modules/mob/living/carbon/life.dm
	tgui/assets/tgui.css
	tgui/assets/tgui.js
	tgui/scripts/interfaces/atmos_filter.ract
 2016-01-13 20:07:21 -06:00
Cheridan 6c9fa9eb72 Merge pull request #14389 from phil235/VisibleMessageRefactor 
Refactor the visible_message() proc to be faster in some cases.
 2016-01-09 22:16:57 -06:00
phil235 60f72d059d - switch visible_message() back to using get_hearers_in_view(), because using inLineOfSight() creates some bugs. visible_message() will still be faster than current version, but only when there's a blind_message used. 
- Fixes hostile animal not seeing any target near them if they are sitting on something opaque (wall, mech,..).
 2016-01-05 16:46:26 +01:00
Aranclanos 6a667d080e Merge pull request #14349 from AnturK/awayareas 
Adds away areas to ghost teleport/ admin jump list
 2016-01-05 04:54:39 -03:00
Bjorn Neergaard 8994f95308 Clean some old comments 2016-01-04 12:22:22 -06:00
Bjorn Neergaard 57cd223eb0 Fix contains proc to use a loop 2016-01-04 12:17:09 -06:00
Bjorn Neergaard dc69cbaefb Allow UIs to be attached to datums; various fixes 2016-01-04 10:46:31 -06:00
AnturK 4a3324b673 Adds away areas to ghost teleport/ admin jump list 2016-01-03 20:25:48 +01:00
duncathan b18c6c2c5c Merge branch 'master' of https://github.com/tgstation/-tg-station into listmos 
Conflicts:
	nano/assets/nanoui.js
	nano/bower.json
	nano/templates/atmos_filter.dot
 2016-01-02 18:02:54 -06:00
duncathan 8392974ad0 fixes associative list; adds gas_overlay to "datum gases" 2015-12-29 22:50:09 -06:00
duncathan 17f167bcb7 associative list 2015-12-29 13:33:12 -06:00
Tkdrg 2a08622b7e Stealthmin Improvements 
Removes stealthmins from the orbit list and makes them invisible.
Remember to always use dsay instead of say to avoid the (F) links!
 2015-12-29 15:09:27 -03:00
duncathan salt b943109a02 Merge pull request #13905 from KorPhaeron/weather 
Weather datums [WIP]
 2015-12-28 22:06:31 +01:00
duncathan cc9c5768ca Merge branch 'master' of https://github.com/tgstation/-tg-station into listmos 
Conflicts:
	code/datums/gas_mixture.dm
 2015-12-28 13:59:16 -06:00
duncathan b18cb5fca8 making shit compile 2015-12-28 08:31:20 -06:00
MrStonedOne 5f68bedcd1 Upgrades do_after and progress bars 2015-12-26 21:04:19 -08:00