cyberpresidentvanellope/CHOMPStation2
1
0
Fork 0
mirror of https://github.com/CHOMPStation2/CHOMPStation2.git synced 2025-12-13 03:33:21 +00:00
Code Issues Packages Projects Releases Wiki Activity
21,439 Commits 5 Branches 0 Tags
901bfe7c664836f1efa93cd8ed2ccd05e3fb8eb6
Commit Graph

3061 Commits

Author SHA1 Message Date
PsiOmega
52e6f96dc7 Merge remote-tracking branch 'upstream/dev-freeze' into dev 2014-12-09 17:55:14 +01:00
Ccomp5950
cab064cd16 Merge pull request #7340 from Zuhayr/dev-freeze 
Dev-freeze fixes.
 2014-12-09 11:48:33 -05:00
Amunak
e068d9f8d4 Blast doors' sprite now doesn't disappear when damaged - fixes #7341 2014-12-09 14:50:36 +01:00
Zuhayr
79fbc2cde9 Fixes autolathe menu. 2014-12-09 21:32:40 +10:30
PsiOmegaDelta
63a5d009c7 Merge pull request #7267 from GinjaNinja32/noise 
Audible emote improvement, adds ability to emote over radio.
 2014-12-09 11:54:57 +01:00
PsiOmega
48aeefa85a Merge remote-tracking branch 'upstream/dev-freeze' into dev 
Conflicts:
	code/game/gamemodes/cult/talisman.dm
	maps/exodus-1.dmm
 2014-12-09 09:42:14 +01:00
Zuhayr
6a8aa48cac Merge pull request #7309 from PsiOmegaDelta/DiscoIsDead 
Fixes #7308.
 2014-12-09 18:18:21 +10:30
GinjaNinja32
362af29cbc Fixes #7320 2014-12-08 20:11:07 +00:00
PsiOmega
887e2c3abf Fixes #7308. 
Adds missing parent call in Del().
 2014-12-08 18:20:39 +01:00
PsiOmega
445dba869d Merge branch 'dev-freeze' into dev 2014-12-08 17:38:13 +01:00
PsiOmega
4d6d74b859 Merge remote-tracking branch 'upstream/master' into dev-freeze 
Conflicts:
	code/game/machinery/portable_turret.dm
 2014-12-08 17:37:42 +01:00
Zuhayr
a2d3a0055e Fixes #7301 2014-12-09 02:35:46 +10:30
GinjaNinja32
681a6d21ea Merge remote-tracking branch 'upstream/dev' into ! 
Conflicts:
	code/modules/mob/hear_say.dm
 2014-12-08 15:32:49 +00:00
Mloc
83f2a5ba5a fix some misplaced set_dir()s 
fixes part of #7284
fixes #7288
fixes one of #7287

Signed-off-by: Mloc <colmohici@gmail.com>
 2014-12-08 10:09:09 +00:00
Zuhayr
371bdb10d9 Merge branch 'dev' of https://github.com/Baystation12/Baystation12 into dev-freeze 2014-12-08 13:03:20 +10:30
Zuhayr
3c66bd3920 Merge resolution. 2014-12-08 13:01:04 +10:30
PsiOmegaDelta
3ddb6eed96 Merge pull request #7222 from mwerezak/holospace 
Holodeck
 2014-12-07 22:05:49 +01:00
Zuhayr
7ff46d64fb Fixes #7162. Eject ID verb for laptops is still busted though. 2014-12-08 04:22:56 +10:30
GinjaNinja32
6a975a1e6a Noise emotes 
Conflicts:
	code/modules/mob/living/carbon/brain/say.dm
 2014-12-07 12:09:02 +00:00
Zuhayr
2d7ea3028f Merge pull request #7257 from Baystation12/master 
Updating dev from master.
 2014-12-07 11:28:29 +10:30
Zuhayr
1dc68e22bc Merge pull request #7258 from Baystation12/master 
Updating dev-freeze from master.
 2014-12-07 11:28:27 +10:30
mwerezak
4582b2892a HTML formatting 
Also removes redundant holotable grab handling.
 2014-12-06 18:20:40 -05:00
Segrain
8df3e41788 Fix for #7204. 2014-12-06 18:08:12 +03:00
Segrain
bb4f81e443 Fix for #7232. 2014-12-06 18:01:31 +03:00
mwerezak
51bbd6e0da Merge remote-tracking branch 'upstream/dev' into holospace 2014-12-05 21:29:50 -05:00
mwerezak
44f2891966 Emagged holodeck consoles stay that way. 
Separates emagged state and holodeck safety state, prevents silicons from re-enabling safeties if someone has emagged the console.
 2014-12-05 21:28:29 -05:00
mwerezak
3dc947806f Cameras now use the broken circuitboard item as well. 2014-12-04 17:16:56 -05:00
mwerezak
89cef05a19 Merge remote-tracking branch 'upstream/dev' into secure-airlock 2014-12-04 17:15:27 -05:00
mwerezak
58f227ec69 Cleans up airlock electronics 
Removes the icon_state hack
Moves airlock electronics creation into it's own proc.
Moved airlock creation from a door assembly to airlock/New()
 2014-12-04 16:40:27 -05:00
mwerezak
83a482a548 Makes secure airlock electronics available from the circuit imprinter 2014-12-04 13:28:26 -05:00
mwerezak
99910686ad Holocarp can spawn in the space scenery with a small probability. 2014-12-04 10:03:35 -05:00
mwerezak
77288fb951 Merge remote-tracking branch 'upstream/dev' into camera 
Conflicts:
	code/game/machinery/portable_turret.dm
 2014-12-03 23:37:02 -05:00
mwerezak
63aa4b1a4e Holodeck computer uses more power when active and turns off if power is lost. 
Allows players to float when using the 'Space' holodeck scenery.
Fixes holodeck deleting space carp when the scenery is changed.
Holocarp start docile and cannot leave the holodeck unless the conole is emagged.
 2014-12-03 15:04:59 -05:00
mwerezak
01fbe4b542 Fixes portable turret ex_act() 
Class 3 is the least severe, not the most.
 2014-12-03 10:36:30 -05:00
mwerezak
fad5506683 Cameras can be broken by weapons/projectiles, fixes 
Fixes being able to show papers to AIs through deactivated cameras.
Fixes being able to break doors with TOX, OXY, and CLONE damage.
Fixes camera alarms persisting after the camera is deleted.
Fixes #7021.
Some camera cleanup.
 2014-12-03 10:36:30 -05:00
PsiOmega
cb4a4d67a1 Merge remote-tracking branch 'upstream/dev' into Turrets 2014-12-03 11:38:54 +01:00
Ccomp5950
f1c77dcb16 Merge pull request #7190 from PsiOmegaDelta/Topic 
Fixes exploit that lets AIs use machinery even after cameras are disabled.
 2014-12-02 20:29:47 -05:00
PsiOmegaDelta
4582c0038b Merge pull request #7205 from Mloc/bs12-setdir 
refactor 'dir = ' into 'set_dir()'
 2014-12-02 14:38:31 +01:00
Mloc-Argent
117ca6a135 refactor 'dir = ' into 'set_dir()' 
This should have little/no gameplay effect right now, just paving the
 way for directional lights.
Replaced handle_rotation() on buckly things with this.

Signed-off-by: Mloc-Argent <colmohici@gmail.com>
 2014-12-01 13:44:02 +00:00
Atlantiscze
64f9a502f9 Mining robot module upgrade 
- Mining cyborgs can now properly work with drills.
- Mining cyborgs have received ore scanner, crowbar, and limited version of magnetic gripper.
- Mining cyborgs can now swap power cells inside mining drills, as well as upgrade them if provided better parts.
- As a bonus, cyborgs can now see how much ore is in ore boxes (because it makes sense that cyborg which mined ton of ore can check how much ore it mined)
 2014-12-01 05:11:35 +01:00
PsiOmega
493465453e Turret controls now affects all aspects of slaved turrets. 2014-11-30 15:50:51 +01:00
PsiOmega
8857365c1c Fixes exploit that lets AIs use machinery even after cameras are disabled. 2014-11-30 15:24:39 +01:00
PsiOmega
0731badf87 Merge remote-tracking branch 'upstream/master' into dev 
Conflicts:
	code/modules/power/smes.dm
	code/modules/power/smes_construction.dm
	maps/tgstation2.dmm
 2014-11-30 10:54:15 +01:00
Chinsky
c0e54f23cf Merge pull request #7152 from PsiOmegaDelta/RoboCircuit 
Robo circuit
 2014-11-30 12:50:36 +03:00
Chinsky
edede8ad34 Merge pull request #7153 from PsiOmegaDelta/BeaconBanCheck 
Syndicate Beacons no longer attempt to convert traitor banned players.
 2014-11-30 12:50:12 +03:00
PsiOmega
5e34d12877 Merge remote-tracking branch 'upstream/dev' into RoboCircuit 
Conflicts:
	code/modules/mob/living/carbon/brain/posibrain.dm
	maps/exodus-1.dmm
 2014-11-30 10:47:36 +01:00
PsiOmegaDelta
1780b9904f Merge pull request #7164 from Amunak/chat-shenanigans 
Mostly chat-related improvements, mainly adding chattags (icons) to important channels
 2014-11-29 16:07:35 +01:00
Loganbacca
7a94f30da2 Grass seed runtime fix 
Fixes grass seeds causing a runtime when putting a stack through the seed extractor with only 1 tile left in the stack.
 2014-11-30 00:11:47 +13:00
PsiOmega
0f8156e77e Merge remote-tracking branch 'upstream/master' into dev 
Conflicts:
	code/game/objects/structures.dm
	code/game/objects/structures/inflatable.dm
 2014-11-29 10:09:03 +01:00
mwerezak
b84bb4ff23 Fixes bubble/hull shield generators not updating air zones, update_nearby_tiles() cleanup. 2014-11-28 19:37:31 -05:00