Commit Graph

17460 Commits

Author SHA1 Message Date
Neerti
be0971e690 Adds sabiram's help text to the game. 2015-03-09 23:19:15 -04:00
Zuhayr
277ceea894 Merge pull request #8405 from PsiOmegaDelta/StationAlertRuntime
Station Alert Runtime Fix
2015-03-10 09:30:57 +10:30
Zuhayr
fb56784fcb Merge pull request #8408 from mwerezak/examine-fix
Examine fix
2015-03-10 09:30:51 +10:30
Zuhayr
00976aea43 Merge pull request #8417 from PsiOmegaDelta/SolidMatter
Attemps to fix #8390 + solid bonus
2015-03-10 09:29:04 +10:30
Zuhayr
fc985c2a27 Merge pull request #8416 from PsiOmegaDelta/Ninjas
Fixes ninja spawn logic.
2015-03-10 09:27:11 +10:30
Daniel García Baldomir
2fa6bb9ab2 Fixes mass driver not being registered on machines. 2015-03-09 21:54:38 +01:00
Chinsky
7a066b3c69 Merge pull request #8418 from mwerezak/supply-pack
More tweaks
2015-03-09 23:28:15 +03:00
mwerezak
645910947b Adds orderable flaregun crate
Mainly to make double-barrelled shotguns orderable.
2015-03-09 16:00:49 -04:00
PsiOmega
baed39c263 Attempts to fix persistent station alarms. Makes wardrobes solid. 2015-03-09 20:55:05 +01:00
mwerezak
b9d2517d83 Tweaks random gun spawners and supply packs
laser carbines and laser pistols spawn in the armoury with equal
probability.
Stunshells are now rare like they should be.
Shotgun crates now have two combat shotguns, as they are less likely to
spawn in the armoury anyways.
Weapons crate comes with laser pistols, energy weapons crate comes with
laser carbines. Seemed more consistent that way.
2015-03-09 15:47:25 -04:00
mwerezak
91d7dd7049 Adjusts item_state placeholders
Tries to switch the current placeholders for something less awkward
looking. As well, the WT550 will no longer be mistaken for a pistol.
2015-03-09 15:39:24 -04:00
Chinsky
d433ccead2 Merge pull request #8412 from Neerti/3-9-2015_air_alarm_nano_shrink
Makes the width of the nanoUI for air alarms smaller.
2015-03-09 22:13:19 +03:00
Chinsky
ec9511c943 Merge pull request #8402 from PsiOmegaDelta/RemoteAir
Fixes various alarm issues.
2015-03-09 22:07:02 +03:00
PsiOmega
57c0591283 Fixes ninja spawn logic.
Fixes the logic I re-made after a PR comment without double-checking it.
Changes ninjastart to use the actual landmarks instead of locs for consistency.
2015-03-09 19:22:07 +01:00
PsiOmegaDelta
b09606d85c Merge pull request #8415 from mwerezak/runtimes
More runtime fixes
2015-03-09 17:51:59 +01:00
mwerezak
b60a045d70 Fixes door runtime, removes user = null hack 2015-03-09 12:43:10 -04:00
mwerezak
188c4491c7 Fixes xenoarch runtime 2015-03-09 12:20:08 -04:00
mwerezak
e840ba2d25 Fixes photocopier runtime 2015-03-09 12:12:31 -04:00
mwerezak
385ff4f2fa Examine tab modularity
Also fixes antag info text sticking around if antag/observer status is lost
2015-03-09 12:09:18 -04:00
mwerezak
26cb0fe2c6 Fixes medical records laptop runtime 2015-03-09 12:04:04 -04:00
mwerezak
6bfa4ef3d5 Fixes AI freelook runtime 2015-03-09 11:59:02 -04:00
Neerti
c03535f03d Makes the width of the nanoUI for air alarms smaller. 2015-03-09 11:07:21 -04:00
Zuhayr
b43aa4b2b4 Merge pull request #8409 from mwerezak/misc
Tweaks for Z8, armour vests, merc blood packs
2015-03-10 00:51:52 +10:30
GinjaNinja32
bbae1a49e5 Fixes vines spreading through doors 2015-03-09 09:04:22 +00:00
mwerezak
a28378f819 Fixes space movement runtime 2015-03-09 03:32:18 -04:00
mwerezak
17780e196a Fixes medical record cabinet runtime 2015-03-09 03:18:38 -04:00
mwerezak
4c7138db14 Adds four mercenary vests to the merc base, tweaks 2015-03-09 03:15:45 -04:00
mwerezak
5abf0248fc Firing the Z8 grenade launch automatically switches back to regular firing. 2015-03-09 03:14:26 -04:00
mwerezak
0b5575897d Updates maint drone helptext 2015-03-09 02:34:21 -04:00
mwerezak
e5a9b686aa Fixes human examine
Fixes issues introduced with the examine tab system by decoupling the
examine() proc from the code that updates a mob's description holders.
Puts a few things in more logical places.
2015-03-09 02:33:43 -04:00
PsiOmega
6cca0b6169 Station Alert Runtime Fix
Fixes an issue where station alert consoles could potentially runtime due to alarm_monitor not yet being initialized.
2015-03-08 23:02:29 +01:00
PsiOmega
e05e024cc5 Fixes issues with remote air alarm access. 2015-03-08 18:31:59 +01:00
PsiOmega
cfbba5c153 Station alert monitor should now only react to major alarms. 2015-03-08 17:58:48 +01:00
Chinsky
db450303c4 Merge pull request #8379 from Neerti/3-6-2015_help_text_weapons
Examine Tab Text: (Some) Weapons
2015-03-08 10:57:36 +03:00
Neerti
a49dcb2470 Adds help text and some antag text to common weapons. Makes chameleon gun change proc play nice with multiple definitions. Rest of chameleon stuff will be changed later when I get around to it. 2015-03-06 23:40:50 -05:00
Zuhayr
ac860b976a Fixing compile issues, adjusted buckle code after a weird merge. 2015-03-07 11:52:14 +10:30
Zuhayr
9f1e04aa50 Thanks TortoiseGit. 2015-03-07 11:40:00 +10:30
Zuhayr
1984ef6e51 Master into dev-freeze. 2015-03-07 11:33:39 +10:30
PsiOmega
0262ab0de0 Runtime fixes
Fixes
````
runtime error: Cannot read null.name
proc name: sql report cyborg death (/proc/sql_report_cyborg_death)
  source file: statistics.dm,87
  usr: the maintenance drone (106) (/mob/living/silicon/robot/drone)
  src: null
````

````
runtime error: Cannot read null.name
proc name: sql report death (/proc/sql_report_death)
  source file: statistics.dm,52
  usr: null
  src: null
````
````
runtime error: Cannot read null.armor
proc name: infection check (/proc/infection_check)
  source file: helpers.dm,16
  usr: null
  src: null
````
````
runtime error: bad client
proc name: open (/datum/nanoui/proc/open)
  source file: nanoui.dm,419
  usr: null
  src: /datum/nanoui (/datum/nanoui)
/datum/nanoui (/datum/nanoui): open()
````
````
runtime error: undefined variable /obj/effect/plantsegment/var/movable
proc name: update canmove (/mob/proc/update_canmove)
  source file: mob.dm,862
  usr: null
  src: the monkey (643) (/mob/living/carbon/monkey)
````
2015-03-06 18:39:44 +01:00
Zuhayr
82640b95e9 Merge pull request #8370 from PsiOmegaDelta/PaperTracking
AI can now track people holding up objects to the camera.
2015-03-06 22:18:27 +10:30
Chinsky
36233b72e2 Merge pull request #8367 from mwerezak/cult-conversion
Improves cult conversion
2015-03-06 11:57:03 +03:00
Chinsky
07ee8424da Merge pull request #8371 from mwerezak/gun-rewrite
Edits Z8 desc
2015-03-06 11:56:31 +03:00
mwerezak
875f805724 Edits Z8 desc 2015-03-06 00:06:53 -05:00
mwerezak
32ee4d57dd Improves cult conversion
Now uses a continuous damage system, dealing damage once every 100 ticks (~10 seconds).
Also improves effects dealt when resisting conversion.
2015-03-05 23:58:56 -05:00
Chinsky
f064305a7b Fixes #8268 2015-03-06 07:11:19 +03:00
Daniel García Baldomir
429b35b526 Removed auto_use_power from process. 2015-03-06 00:05:22 +01:00
Daniel García Baldomir
73ca3b0656 Fixed holosign not being registered as machine. The master controller does not find you worthy of the machines list if you don't process. 2015-03-05 23:30:06 +01:00
PsiOmega
bdd84767d1 AI can now track people holding up objects to the camera. 2015-03-05 22:28:22 +01:00
Daniel García Baldomir
94477bd66c Minor fixes on the overlays. Made holosigns functional again. 2015-03-05 21:47:26 +01:00
PsiOmegaDelta
45e2423dca Merge pull request #8365 from Ccomp5950/re-admin
Staff now have a "re-admin self" button after de-admining themselves.
2015-03-05 18:10:46 +01:00