ff25503b4d
Merge pull request #4384 from Ikarrus/deputybands
...
[MAP] Boxstation Update and Deputy Armbands
2014-08-12 08:12:15 +01:00
b05b214d79
Merge pull request #4344 from Aranclanos/removewarn
...
Removes warn button on the player panel.
2014-08-12 08:08:21 +01:00
9cfb19f511
Merge pull request #4373 from paprka/deepgunlore
...
Whole bunch of gun-related stuff
2014-08-11 16:25:05 +01:00
d5e578c6aa
Merge pull request #4356 from paprka/minerals
...
Asteroid mineral turfs rates and rescaling
2014-08-11 14:03:11 +01:00
12b8bba238
Merge pull request #4362 from paprka/borghailer
...
Adds sec hailer to secborg modules
2014-08-11 14:02:51 +01:00
c9bfc556e7
Merge pull request #4345 from Aranclanos/dielighting
...
Removes lights from the machinery process() list
2014-08-11 13:58:05 +01:00
55a11982da
Merge pull request #4361 from paprka/swatremoval
...
Replaces swat helmet for syndicates
2014-08-11 12:15:56 +02:00
d0a2d94ea9
Merge pull request #4331 from scoopscoop/protolatherepeater
...
Allows the protolathe to build multiples of items.
2014-08-10 10:24:24 +02:00
e3c26bfdd1
Merge remote-tracking branch 'remotes/upstream/master' into deepgunlore
...
Conflicts:
code/game/objects/items/weapons/storage/uplink_kits.dm
2014-08-09 16:19:33 -07:00
22e0081cf3
Resolved Conflicts:
...
code/game/objects/items/weapons/storage/boxes.dm
2014-08-09 14:19:43 -06:00
3c96428603
[MAP] Boxstation Update and Deputy Armbands
...
-Singularity engine is now sealed off from outer space, making it more secure from saboteurs and safe from meteors
-Deputy armbands (red) added to HoS office. These can be ad-hoc distributed by the HoS when deputizing crew
-Slight remap of HoS office to fit everything in there. added a filing cabinet and paper, too
-Shutters added under robotics and R&D's primary hallway windows
-Filing cabinet and paper added in bridge
2014-08-09 14:11:04 -06:00
837428babd
Merge pull request #4370 from hornygranny/badmins
...
admins can't edit their rank's powers
2014-08-09 17:02:28 -03:00
866bf55b48
Merge pull request #4377 from Jordie0608/ogdensnutgoneflake
...
Fixes #4338 multiple weed nodes on turf
2014-08-09 16:21:32 -03:00
97c087db27
Merge pull request #4379 from paprka/lolindents
...
Fixes security hardsuit SSU
2014-08-09 16:19:42 -03:00
365de76240
Merge pull request #4340 from MrPerson/giacom_was_right_I_should_have_just_deld_mobs
...
Make new_players dereference from their mind when observing
2014-08-09 11:19:07 -05:00
7282f44b5f
lol indentations
2014-08-08 10:16:48 -07:00
1ed6d7921c
stops doubling of weed nodes
2014-08-09 01:54:16 +10:00
b5423346e4
Merge pull request #4307 from Zelacks/alienimagefix
...
Fix for Alien Infection Image
2014-08-08 15:12:37 +01:00
a65d26f792
Merge remote-tracking branch 'remotes/upstream/master' into deepgunlore
...
Conflicts:
code/modules/projectiles/projectile.dm
2014-08-08 06:48:17 -07:00
1177b3f3ad
Merge pull request #4348 from Firecage/NANOABSOLUTES
...
Nanoabsolutes
2014-08-08 12:16:13 +02:00
63692588b9
Merge pull request #4346 from Firecage/FUCKINABSOLUTEPATHS
...
CLUCKING ABSOLUTE PATHS
2014-08-08 12:15:22 +02:00
64bc2abec3
sprite and fix
2014-08-07 14:52:40 -07:00
726b939754
whole bunch of gun stuff
2014-08-07 14:39:31 -07:00
c538030790
admins can't edit their rank's powers
2014-08-07 12:00:48 -07:00
8c4bde6be8
adds secborg hailer
2014-08-07 05:00:10 -07:00
10f6ca8c7e
removes swat helmet
2014-08-07 04:47:55 -07:00
6770f6fdda
second rates
2014-08-07 00:02:03 -07:00
d41a469ff4
Merge branch 'master' of https://github.com/tgstation/-tg-station into goodbyedeadspace
...
Conflicts:
code/game/mecha/mecha.dm
2014-08-06 15:22:56 -07:00
129865d565
Giacom Fixes
2014-08-06 20:22:36 +02:00
9732b3a254
Absolute paths for 3 nanoUI files
...
...
...
2014-08-06 19:02:30 +02:00
8ee10c4940
Merge branch 'master' of https://github.com/tgstation/-tg-station.git
...
FUCK SPACES
Merge branch 'AIcode'
Merge branch 'Foodstuffssss'
Merge branch 'master' of https://github.com/tgstation/-tg-station.git
Merge branch 'girderwrenchtime'
Merge branch 'Chamjumpsuit'
Merge branch 'Bookcasefix'
Merge branch 'Assemblyfix'
Merge branch 'metroidbegone'
Merge branch 'master' of https://github.com/tgstation/-tg-station.git
Merge branch 'master' of https://github.com/tgstation/-tg-station.git
FUCKING ABSOLUTE PATHS
2014-08-06 19:02:28 +02:00
40de38f252
moremoarmoaaaaarabsolutes
2014-08-06 16:54:06 +02:00
24972ccc5c
ABSOLUTELY ABSOLUTE
2014-08-06 16:21:24 +02:00
510b20a8e5
MoarABSOLUTEPATHS
2014-08-06 15:51:40 +02:00
88be87e8d3
FUCKING ABSOLUTE PATHS
2014-08-06 15:15:56 +02:00
55dd64fdc2
Adds static power value on areas. These variables should replace machines on the process list, that are only there to consume power.
...
This commit removes lights from the process list, about 500 of them on the current map.
The purpose of this is to reduce lag from the master controller ticker.
2014-08-06 06:57:52 -03:00
c79b9fe6bf
Merge pull request #4336 from Incoming5643/bluepanties
...
Magic Mania 1⅔: Fixes #4335
2014-08-06 10:41:07 +01:00
12242cad7d
Removes the unused and useless warn button on the player panel.
2014-08-06 03:43:28 -03:00
c813d9df46
Make new_players GC when observing
...
When observing, that observer would be given their original new_player's mind, but that mind would still have the new_player as its current. This caused the new_player to fail to GC and resulted in the observer's mind's current becoming null.
Fix: Just delete the new_player mind when the player observes. If an admin turns them into a human or whatever, a new mind will be created automatically then.
2014-08-05 18:50:09 -07:00
879f5d7c0e
Changed it!
2014-08-05 19:51:08 -04:00
4e91b2b655
Simplifies the species picking
...
Adds an update_icons() to minimize the effects of #4252 , but it's still a problem
2014-08-05 14:11:45 -04:00
bec4e856ca
Merge pull request #4327 from Aranclanos/clickcooldowndefine
...
Defines for click cooldown numbers and click cooldown for paper camera spam.
2014-08-05 10:22:52 +01:00
4bcb228ea3
Merge pull request #4320 from MrPerson/MM7_Junk_Man
...
Fixes that "temporary black screen on deletion" issue for disposals
2014-08-05 10:22:15 +01:00
2283b303ac
Fixes #4335
...
Readds the 1/12 chance of stumbling out the bolt of change fully human with no mutantrace. It must have gotten lost during the mutantrace datumizing
2014-08-04 17:51:33 -04:00
d521e6e827
Avoids division by zero
2014-08-04 15:58:30 +03:00
327086b607
Allows the protolathe to build multiples of items.
2014-08-04 15:39:54 +03:00
7946e96fcb
Merge pull request #4326 from Aranclanos/strippanel
...
Strip panel.
2014-08-04 09:26:24 +01:00
ff84e58ad6
Merge pull request #4321 from Incoming5643/tincans
...
Fixes #2738
2014-08-04 09:24:47 +01:00
ccae5781c5
added two defines CLICK_CD_RANGE and CLICK_CD_MELEE (4 and 8), replaced all changeNext_move() procs to use these two defines.
...
Added melee click cooldown for paper spam on cameras.
2014-08-03 22:14:56 -03:00
f5ee1a573a
The set internals button on the strip panel will properly appear if it's on the exosuit.
...
The strip panel should be prettier now.
2014-08-03 17:59:56 -03:00
Alex
Swag McYolosteinen
paprka
ikarrus
Aranclanos
Cheridan
Jordie0608
Hornygranny
Firecage
MrPerson
Incoming
scoopscoop