Commit Graph

6473 Commits

Author SHA1 Message Date
Cheridan
6a9a5c820e Merge pull request #13560 from Incoming5643/and_as_the_sword_looked_upon_the_infinite_cosmos_it_knew_it_just_had_to_try_and_fuck_everything_up
Supermatter swords and the infinite void
2015-12-12 23:22:48 -06:00
Cheridan
5dcc208ee2 Merge pull request #13569 from KorPhaeron/low_layer
Fixes girders being on a low layer
2015-12-12 13:01:32 -06:00
Cheridan
45c06ae2cd Merge pull request #13555 from bgobandit/sexyhonk
Buffs the sexy clown.
2015-12-12 13:00:46 -06:00
Cheridan
99e7506731 Merge pull request #13572 from KorPhaeron/creepy_crawly
Various Spider Fixes
2015-12-12 12:43:03 -06:00
Cheridan
c641643c55 Merge pull request #13539 from KorPhaeron/dance_moves
Hitting someone with a dualsaber now has a chance to make you *flip
2015-12-11 17:27:42 -06:00
Cheridan
78093c0bf0 Merge pull request #13556 from bgobandit/matsagainfuckina
Adds mats/origin tech/burn_state to more items.
2015-12-11 17:13:42 -06:00
Razharas
a251002d6f Merge pull request #13532 from Jalleo/pAI
Personal Artificial Intelligence Fix
2015-12-11 22:46:24 +03:00
Razharas
83bb88868c Merge pull request #13153 from Jordie0608/arguablyallgunsareenergygunsandallbeamsareprojectiles
Unifies energy gun self charging
2015-12-11 22:38:07 +03:00
Cheridan
a002ca8917 Merge pull request #13542 from KorPhaeron/gigantic_epipens
Fixes small objects covering the entire tile after a fire
2015-12-11 07:23:00 -06:00
Cheridan
41709c7016 Merge pull request #13546 from KorPhaeron/RADIATION_PULSE_DETECTED
Removes rad pulse admin notice
2015-12-11 07:14:15 -06:00
KorPhaeron
44873907f4 More spider fixes 2015-12-11 04:42:04 -06:00
KorPhaeron
0ece383776 Fixes girders on low layer 2015-12-11 02:29:46 -06:00
Jordie0608
7719d8cb54 Merge branch 'master' of https://github.com/tgstation/-tg-station into arguablyallgunsareenergygunsandallbeamsareprojectiles
Conflicts:
	code/modules/projectiles/guns/energy/laser.dm
2015-12-11 15:59:46 +11:00
Incoming
8ee40a1518 supermatter now reduces turf to base turf, and checks for base turf instead of space.
(in most settings, base turf IS space)
2015-12-10 19:46:35 -05:00
bgobandit
73471eb8b1 sexy clown is now a sexy object oriented clown 2015-12-10 19:19:03 -05:00
Incoming
a05e29b27e Supermatter swords can no longer consume space itself to spam radiation at people. 2015-12-10 17:13:40 -05:00
bgobandit
984582f6ba tweaks and shit 2015-12-10 15:48:22 -05:00
bgobandit
92d86dd369 Adds mats/origintech/burn_state to more items. 2015-12-10 15:32:28 -05:00
blah
844b10fa33 Whoops I left a debug 2015-12-10 14:42:43 +00:00
blah
acf95ccfd9 Fixes the pAI and removes the .gitignore issue that I caused from other stuff 2015-12-10 14:40:04 +00:00
KorPhaeron
1bcd8e57f2 Removes rad pulse admin notice 2015-12-10 04:26:56 -06:00
KorPhaeron
50e4e77250 Fixes UI stuff 2015-12-09 21:37:18 -06:00
KorPhaeron
56ecfaff68 Flip 2015-12-09 19:59:12 -06:00
blah
5fff63d62c Changes pAI to have hearable_message() rather than visible_message() as that doesn’t work from inside objects 2015-12-09 20:04:54 +00:00
AnturK
6d63d5e234 Fixes doppler arrays 2015-12-09 20:06:14 +01:00
Cheridan
da3eba756d Merge pull request #13463 from Incoming5643/a_placebo_effect
Adds glowcaps
2015-12-08 22:08:25 -06:00
duncathan salt
160d5428b8 Merge pull request #13474 from Shadowlight213/Aghost_control
Allows admins to interact with most machines like an AI [Review Ready]
2015-12-08 11:51:27 -06:00
duncathan salt
bea8d35ff5 Merge pull request #13437 from neersighted/clickable_stats
Refactor MC/Failsafe/add Subsystems
2015-12-07 19:58:46 -06:00
duncathan salt
0472592b97 Merge pull request #13327 from KorPhaeron/reactive
check_shields() refactor
2015-12-07 19:58:17 -06:00
Shadowlight213
71e76f6eec Merge branch 'master' of https://github.com/tgstation/-tg-station into Aghost_control 2015-12-07 13:10:53 -08:00
Remie Richards
91c4d1bef8 Merge pull request #13440 from octareenroon91/patch-32
Give wallets merged access of all IDs inside.
2015-12-07 17:37:44 +00:00
Shadowlight213
3c35ac809e Hopefully finally fixes the nanoui issue. 2015-12-06 23:24:01 -08:00
Shadowlight213
74c27189b9 Renames IsAGhost to IsAdminGhost.
Reworks checks to not need stat to be 0
Fixes the majority of the Nanoui bugs.
2015-12-06 20:21:43 -08:00
Razharas
02fe4ec5a8 Merge pull request #13443 from MrStonedOne/DONTWAIT-IKNOWWHATYOURTHINKING-YOUDONTNEEDMYRETURN-DONTWAITCAUSEISLEEP
changes `spawn() throw_at` to `throw_at_fast set waitfor = 0`
2015-12-06 19:52:06 +03:00
Jordie
45a9e138b2 Merge pull request #13435 from SuperSayu/window_unbreaker
Fixes window fixing
2015-12-06 12:06:37 +11:00
octareenroon91
5646f0eb5b syntax error 2015-12-05 18:42:50 -06:00
MrStonedOne
9fa4288b08 Makes everything that used spawn () throw_at use throw_at_fast 2015-12-05 16:40:52 -08:00
octareenroon91
3c75d78f84 Use a list instead of net_id
reduce excess calls to update_icon()
2015-12-05 16:35:41 -06:00
Incoming
7f3a1158d2 Adds glowcaps
Glowcaps are red mutant glowshrooms. They can be used in all the same ways normal glowshrooms can, but they also boast a special feature.

When you finish eating a glowcap, the batteries of any electronics you have on/in you are recharged up to potency%.
2015-12-05 03:35:23 -05:00
Bjorn Neergaard
34b717afb4 radio_controller -> SSradio, SSbp -> SSnpc 2015-12-04 22:25:24 -06:00
Razharas
41341461b0 Merge pull request #13393 from kingofkosmos/fewinhandsprites
In-hand sprites: transfer tank valve, tracking beacon, pizza box & carp plushie
2015-12-05 01:14:20 +03:00
Remie Richards
87976c358f Merge pull request #13411 from Anonus/ghostexamine
Removes delay on examining objects that also have a nanoui interface as a ghost
2015-12-04 15:58:19 +00:00
MrStonedOne
a5f0f3f594 changes spawn() throw_at to throw_at_fast set waitfor = 0
Set waitfor = 0 has massively less overhead then spawn() but still does basically the same thing.

It causes the first sleep in the stack from that point on to make the set waitfor = 0 proc return . then continue on as if it was spawn()'ed, but it doesn't have to copy over the local vars of the proc so a lot less overhead

http://pastebin.com/kx538RqS
2015-12-04 04:37:16 -08:00
octareenroon91
544295c563 define proc/refreshID 2015-12-04 03:42:54 -06:00
octareenroon91
f3f61367da Give wallets merged access of all IDs inside. 2015-12-04 03:16:43 -06:00
Vincent
6f6968773b Fixes #13418 2015-12-03 22:46:56 -05:00
Razharas
3ea054e84c Merge pull request #13394 from octareenroon91/patch-31
Correct crayon comment
2015-12-03 23:10:55 +03:00
Cheridan
9c7ff23609 Merge pull request #13333 from MrStonedOne/lightingtweaks
Lighting system tweaks. Fixes low lum items having full center brightness, etc.
2015-12-03 13:40:23 -06:00
Cheridan
a3c6f5ad59 Merge pull request #13385 from spudboy555/librarian_pda
Moved Librarian PDA a few pixels to the left.
2015-12-03 11:48:18 -06:00
Nerd Lord
3a96d9bd8c No delay on examining objects with a nanoui interface as a ghost 2015-12-02 22:53:33 -05:00