cyberpresidentvanellope/CHOMPStation2
1
0
Fork 0
mirror of https://github.com/CHOMPStation2/CHOMPStation2.git synced 2025-12-11 10:43:20 +00:00
Code Issues Packages Projects Releases Wiki Activity
28,585 Commits 5 Branches 0 Tags
565e39a28f4391771c573afb3a0d8d17e447766d
Commit Graph

13021 Commits

Author SHA1 Message Date
Zuhayr
565e39a28f Porting forensics from Aurora. 2015-12-10 19:16:28 +10:30
Neerti
e1694c40fe Merge pull request #483 from Hubblenaut/ttv 
Ports Bay Fixes for TTV Yield
 2015-12-09 22:30:25 -05:00
Neerti
e573581a28 Merge pull request #496 from Woodratt/1.2.6_Bar_Signs_and_Power 
1.2.6 Bar Sign and Power tweaks
 2015-12-09 03:41:48 -05:00
woodratt
b1735a3063 1.2.6 Bar Sign and Power tweaks 
- Created prescription Huds for medical and security. Two exist in the medical exam room, two in the security restroom.
- Boot Knives Bar Sign
- Tactical light in the warehouse replaced with a more low speed option
- Adjusted Atmos SMES to input from round start
- Adjusted Main SMES to start with about 70% power and a 700k Output.
 2015-12-09 00:21:26 -08:00
Neerti
894ad58277 Fixes people spawning in space. 
People were spawning in space due to a runtime error that occured when they choose the orange scarf, because the loadout entry lacked a path variable.
 2015-12-09 02:50:51 -05:00
HarpyEagle
a9d3f02cd5 Updates preset TTV bombs, adds debug verb 2015-12-08 18:15:55 +01:00
Hubblenaut
183ac02f32 Merge branch 'master' of https://github.com/PolarisSS13/Polaris 
Conflicts:
	html/changelogs/Hubblenaut-dev.yml
 2015-12-08 15:50:00 +01:00
Hubblenaut
baec8f15d1 Changes to Pushing Mechanics 2015-12-08 15:15:00 +01:00
Neerti
c56e6d173c Merge pull request #463 from Sabess/master 
Added more reskins for the M1911 and some other stuff.
 2015-12-08 08:15:19 -05:00
SinTwo
897e6c8382 Fixes some clothes. 2015-12-07 22:49:32 -05:00
EmperorJon
2dc59a5c96 Merge pull request #469 from EmperorJon/07_Dec._Fix_SMG_desc 
Changes 12mm to 10mm.
 2015-12-07 23:59:50 +00:00
Jon
ef987c5124 Changes 12mm to 10mm. 2015-12-07 23:59:11 +00:00
Neerti
f219980a3d Fixed merge conflicts causing lack of compilation hopefully. 2015-12-07 03:38:38 -05:00
PsiOmegaDelta
a1203ed942 Fixes the broken Antag Uplink. 
NanoUI re-assigns src_object, rather than merely acquiring the host, causing ui_interact() updates to be called on the wrong object.
Fixes #11607.
 2015-12-07 03:06:56 -05:00
PsiOmegaDelta
15cc546556 Backports NanoUI fixes from dev. 
Fixes #11579.

Conflicts:
	code/modules/nano/modules/crew_monitor.dm
 2015-12-07 03:05:39 -05:00
PsiOmegaDelta
9db4ba1da0 Adds a remote interaction state for NanoUI. 
This state has two checks:
A preliminary check of the remote target, ensuring it's powered, etc. If the remote target is fully disabled, it closes the window and conducts no further checks.
It then makes a full check, ensuring that the mob is capable, within range of the source remoting to the remote target, etc.

Unlike most other static interaction states, whoever initializes the remote state is responsible for deleting it properly.

Conflicts:
	polaris.dme
 2015-12-07 02:56:43 -05:00
PsiOmegaDelta
443a376848 Ghosts can now view any object with a NanoUI interface. 
However, ghosts can now also only view objects in range to ensure that the NanoUI window count is kept low.
Admins do not suffer this restriction and may also interact with these windows.
 2015-12-07 02:35:33 -05:00
Neerti
2847d9a7ef Prepares for cherrypicking. 2015-12-07 02:35:20 -05:00
sabess
7e0a8f9145 Fixed notes, oops 2015-12-07 18:31:53 +11:00
sabess
76a11a1fd0 Fixed stuff 2015-12-07 18:11:17 +11:00
Neerti
4ecddd7e8b Adds attack_ghost() to base atmospherics object and APC to allow ghosts to see the nanoUI, and for admins to modify the objects from the interface. 2015-12-07 02:06:25 -05:00
sabess
47a6e38a8d Added more reskins for the M1911, all of which have different sprites when empty. Added this functionality for the default M1911 as well as the default MK58s. 2015-12-07 14:25:06 +11:00
Neerti
e54280b460 Merge pull request #437 from Yoshax/master 
Adds ability to smash drinking bottles on things other than people
 2015-12-06 09:15:46 -05:00
Mark9013100
457c40d46f Fixes #448 and #401, custom loadout edit. 2015-12-06 06:26:06 -05:00
Neerti
ffab1eda95 Fucking fuck. 2015-12-05 18:01:32 -05:00
Neerti
c808371780 Merge pull request #444 from Neerti/12/4/2015_communicators 
Adds cellphones!
 2015-12-05 17:37:35 -05:00
Neerti
3e946447a3 Adds cellphones! Details in the changelog entry. 2015-12-05 17:26:13 -05:00
Datraen
ca6a970182 Fixes the inability to use cargo tugs 2015-12-05 15:15:53 -05:00
Jon
7993d10a3b I'm a moron and this will teach me to not lazy copypaste. 2015-12-05 18:22:48 +00:00
Jon
cb62041cad Adds an "emo fringe" hairstyle that's just emo long without the long bits. I quite like it so whatever. 2015-12-05 15:38:54 +00:00
Yoshax
db7af654ec Adds checks to ensure target is valid, adds user feedback 2015-12-05 15:10:10 +00:00
sabess
dc816938ae Adds some hairstyles! 2015-12-06 01:56:29 +11:00
Yoshax
6fa987f18f Merge branch 'master' of https://github.com/PolarisSS13/Polaris 2015-12-05 14:24:59 +00:00
Yoshax
4c201d8219 Adds ability to smash bottles on things other than people's heads 2015-12-05 14:22:40 +00:00
GinjaNinja32
944b1255e4 add verbs to allow players to spin their view 2015-12-05 10:52:29 +00:00
EmperorJon
f6cb53835c Merge pull request #429 from EmperorJon/05_Dec._Update_main_z_level_space_areas 
Updates all get_base_turf usages to get_base_turf_by_area.
 2015-12-05 04:37:35 +00:00
Jon
85c704676f Updates all get_base_turf usages to get_base_turf_by_area. 
This means that instead of the base turf being defined by the z-level, it's now defined by area and defaulted by z-level.

Updates all "shuttle" and "solar" areas to have a base_turf of space.
Updates docking arms 1, 2, and 3 on the main asteroid level to have a base_turf of space.

Other z-levels may still need updating.

This change means that all actions which destroy or dismantle a tile - for example bombs, a singularity, a shuttle leaving, or deconstruction - now leave these new areas as space not asteroid. Future mapping efforts may need to take this into account.
 2015-12-05 04:24:17 +00:00
Hubblenaut
470d2bb54a Fixes stack creation logic and return value 2015-12-04 15:49:31 +01:00
MagmaRam
e7952d2334 Halves light necessary for diona to live 
Halves the amount of light diona need to feed/maintain health/whatever.
Shouldn't affect the rate at which they do these things, it should only touch
the rate.
 2015-12-03 23:20:12 -06:00
Neerti
b05b34c8e7 Merge pull request #414 from MagmaRam/disposals_fix 
Fix for disposal pipes not vanishing under floors.
 2015-12-03 22:36:06 -05:00
Merchoven
5b3dadfe69 Fix for disposal pipes not vanishing under floors. 
This is a fix for issue #291. Disposals pipes should now properly stop
displaying when a floor is placed on top of them.
 2015-12-03 21:03:46 -06:00
Mark9013100
6e0b906e23 Adds Security/Medical cargopacks. 2015-12-03 20:22:12 -05:00
SinTwo
6c59f7f6ff Merge branch 'master' of https://github.com/PolarisSS13/Polaris into sin2clothes 2015-12-03 18:29:05 -05:00
SinTwo
700ee6177b Clothes Addition, Captain alt title, custom loadout tweakes. 2015-12-03 18:25:45 -05:00
Neerti
c137d40484 Makes stating laws over binary work again. 2015-12-03 14:16:01 -05:00
Neerti
58149b8f4d Replaces :b with #b whenever a synthetic mob joins the game. 2015-12-03 14:02:56 -05:00
Neerti
2c81761494 Removes most references to NSS Exodus. 2015-12-03 13:47:37 -05:00
Neerti
de8db6f909 Merge pull request #405 from Neerti/12/3/2015_psi_is_most_ideal_fixes_handcuffs 
Fixes handcuffs.
 2015-12-03 13:10:35 -05:00
SinTwo
c9db7fdab1 Fixes Voidsuit Helmets 2015-12-03 12:48:53 -05:00
PsiOmegaDelta
2d39621801 Makes it possible to ignore some incapacitation checks. 
This fixes  #11576. Also corrects the viewers() usage in visible_message.

Conflicts:
	code/__defines/mobs.dm
	code/modules/mob/living/carbon/resist.dm
 2015-12-03 12:37:30 -05:00