cyberpresidentvanellope/VOREStation
1
0
Fork 0
mirror of https://github.com/VOREStation/VOREStation.git synced 2026-01-30 19:03:05 +00:00
Code Issues Packages Projects Releases Wiki Activity
16,403 Commits 8 Branches 26 Tags
0dd51f338c130fa6afdf65136bbcd9aaeb0f1bc9
Commit Graph

6974 Commits

Author SHA1 Message Date
Ccomp5950
e8d04262a5 Merge pull request #4524 from Ravensdale/PROTECITON 
Define spelling correction
 2014-03-04 23:11:43 -06:00
Ccomp5950
c066232ab3 Merge branch 'master' of github.com:Baystation12/Baystation12 into dev 2014-03-04 18:29:03 -06:00
Chinsky
98b45e52ac Merge pull request #4518 from yashaldie/master 
fixes IPC brain surgery
 2014-03-04 18:18:33 +04:00
Chinsky
8fa689a433 Merge pull request #4521 from Mloc/bs12-bloodyipcs 
Dionaea can no longer steal blood from species which have the NO_BLOOD flag
 2014-03-04 18:18:10 +04:00
Chinsky
557f8c7e92 Merge pull request #4526 from Mloc/bs12-libnudge 
Adds a C library alternative to the ircbot nudge script.
 2014-03-04 18:13:48 +04:00
Vetinari
1d62ceddaa Merged Upstream 
This is a big one.
 2014-03-04 22:19:09 +11:00
Mloc
f4ca9631b5 Merge pull request #4504 from MrLeebo/severed-limbs-drop-cuffs 
Fractures and severed limbs cause cuffs to fall off
 2014-03-04 10:15:42 +00:00
Mloc
8d048c0179 Merge pull request #4519 from Furlucis/master 
Meat cutting fix
 2014-03-04 10:14:55 +00:00
Mloc-Argent
49890421f8 Adds a C library alternative to the ircbot nudge script. 
This allows for more secure and stable transmission on Linux, but you might see some improvements on Windows too.
Code lies in (confusingly) lib/src.
nudge.c should be compiled to lib/nudge.[dll/so] and be linked against netutil.c.

There's some horribly hacky code in nudge.c to assemble pickled data, but it's probably the fastest way that's still safe.

Signed-off-by: Mloc-Argent <colmohici@gmail.com>
 2014-03-04 10:08:17 +00:00
Ravensdale
9561635942 Merge branch 'dev' of https://github.com/Baystation12/Baystation12 into PROTECITON 2014-03-03 20:26:58 -08:00
Ravensdale
50a45b32ae Fixes a define spelling error. 2014-03-03 20:23:21 -08:00
Mloc
4ddd799359 Merge pull request #4505 from Ccomp5950/ert_admin_only 
Configuration option:  Ability to set ERT to be admin call only.
 2014-03-03 19:21:05 +00:00
Mloc-Argent
8deed8dddd Dionaea can no longer steal blood from species which have the NO_BLOOD flag 
Fixes #4510

Signed-off-by: Mloc-Argent <colmohici@gmail.com>
 2014-03-03 09:15:35 +00:00
Furlucis
01e66b6733 Meat cutting fix 
The other kind of knife actually exists. This one doesn't.
 2014-03-03 02:26:04 -05:00
yashaldie
61a4e37466 fixes IPC brain surgery 
could not start the brain surgery on IPCs this should fix it
 2014-03-03 01:18:31 -05:00
Jeremy Liberman
d41d3b2b9e Fixes UI glitch when losing cuffs from fractures, resisting, or cult magic 2014-03-02 15:08:55 -06:00
Joey Haas
787ea32360 Added 3D glasses to Dormitory 2014-03-02 21:31:46 +01:00
Mloc
37112105f6 Merge pull request #4499 from Ccomp5950/runtime_fixs 
Runtime fix: Depth scanner now won't check the length of null lists.
 2014-03-02 19:56:23 +00:00
Ccomp5950
8f2d5e817f Configuration option: Ability to set ERT to be admin call only. 
Admin request.

Default behavior is what we're used to, that two heads can call for the ERT
with the option turned on it removes the ability for players to call for an ERT and requires admin intervention.
 2014-03-02 06:20:26 -06:00
Jeremy Liberman
4025ccbee5 Fractures and severed limbs cause cuffs to fall off. Deranged spessmen can chew their own wrists to break free. 2014-03-01 22:56:47 -06:00
Ccomp5950
5c482f1c8c Merge pull request #4494 from yashaldie/master 
Fixed Borg toggling broadcast mode
 2014-03-01 11:07:41 -06:00
Ccomp5950
77767db800 Merge pull request #4487 from zekesulastin/laser-scalpel 
Laser Scalpels Ver. 1
 2014-03-01 10:55:18 -06:00
Mloc
c8f2d85b41 Merge pull request #4493 from Loganbacca/baytweak 
Little things
 2014-03-01 15:52:03 +00:00
Ccomp5950
5146268253 Runtime fix: Depth scanner now won't check the length of null lists. 
runtime error: Cannot read null.len
proc name: scan atom (/obj/item/device/depth_scanner/proc/scan_atom)
  source file: tools_depthscanner.dm,31
  usr: Some Guy (/mob/living/carbon/human)
  src: the depth analysis scanner (/obj/item/device/depth_scanner)
  call stack:
the depth analysis scanner (/obj/item/device/depth_scanner): scan atom(Some Guy (/mob/living/carbon/human), Rock (155,169,5) (/turf/simulated/mineral))
Rock (155,169,5) (/turf/simulated/mineral): attackby(the depth analysis scanner (/obj/item/device/depth_scanner), Some Guy (/mob/living/carbon/human))
Some Guy (/mob/living/carbon/human): ClickOn(Rock (155,169,5) (/turf/simulated/mineral), "icon-x=23;icon-y=13;left=1;scr...")
Rock (155,169,5) (/turf/simulated/mineral): Click(Rock (155,169,5) (/turf/simulated/mineral), "mapwindow.map", "icon-x=23;icon-y=13;left=1;scr...")
 2014-02-28 23:03:10 -06:00
DJSnapshot
1e186839c6 added IPCs(machines) to list to make it easier on everyone. 2014-02-28 17:36:50 -08:00
DJSnapshot
3b10ee3ad5 Removing IPC whitelist requirement. 2014-02-28 17:32:29 -08:00
DJSnapshot
acdbb3573a Changed supermatter messages to reflect what they actually mean. 2014-02-28 15:28:11 -08:00
yashaldie
96dc185fde Update robot_modules.dm 2014-02-28 04:42:27 -05:00
yashaldie
36b4af57f2 made module contain channel list 2014-02-28 04:40:36 -05:00
Loganbacca
8e1b286a84 Mining drill text 
- Adds drill_verb variables to pickaxe subtypes, so drills will now be described as "drilling" instead of "picking"
 2014-02-28 12:15:41 +13:00
Loganbacca
fbfdccebaf Suit sensor toggle 
- Changes the suit sensor toggle verb to select from a list, instead of cycling through one mode at a time.
 2014-02-28 12:15:26 +13:00
ZekeSulastin
d4cce9be66 Laser scalpels are now producable 2014-02-26 15:23:08 -05:00
Ccomp5950
39383c331a Merge branch 'dev-freeze' of github.com:Baystation12/Baystation12 into dev 2014-02-26 09:38:40 -06:00
Ccomp5950
c56ec21ee3 Merge branch 'master' of github.com:Baystation12/Baystation12 into dev-freeze 
Conflicts:
	code/modules/reagents/Chemistry-Reagents.dm
 2014-02-26 09:34:38 -06:00
ZekeSulastin
2b3c2064da Initial run of surgery steps for laser scalpels 2014-02-25 15:44:01 -05:00
Mloc-Argent
f5ab084eac Fixes admin attack logs to show up in-game as well as in the logfiles. 
Signed-off-by: Mloc-Argent <colmohici@gmail.com>
 2014-02-25 20:36:46 +00:00
Ccomp5950
ceb220f705 Runtime fix: OH GOD NOT THE BEEs WON'T SOMEONE CALM THEM DOWN? 
Other then NULL?

runtime error: Cannot read null.type
proc name: Life (/mob/living/simple_animal/bee/Life)
  source file: bees.dm,91
runtime error: Cannot read null.type
proc name: Life (/mob/living/simple_animal/bee/Life)
  source file: bees.dm,91
runtime error: Cannot read null.type
proc name: Life (/mob/living/simple_animal/bee/Life)
  source file: bees.dm,91
runtime error: Cannot read null.type
proc name: Life (/mob/living/simple_animal/bee/Life)
  source file: bees.dm,91
runtime error: Cannot read null.type
proc name: Life (/mob/living/simple_animal/bee/Life)
  source file: bees.dm,91
runtime error: Cannot read null.type
proc name: Life (/mob/living/simple_animal/bee/Life)
  source file: bees.dm,91
runtime error: Cannot read null.type
proc name: Life (/mob/living/simple_animal/bee/Life)
  source file: bees.dm,91
runtime error: Cannot read null.type
proc name: Life (/mob/living/simple_animal/bee/Life)
  source file: bees.dm,91
 2014-02-25 00:21:41 -06:00
Chinsky
0ba65efd18 Merge pull request #4477 from Ccomp5950/runtimefixes 
Runtimefixes
 2014-02-25 06:01:59 +04:00
Ccomp5950
23faf801ae Merge pull request #4468 from Segrain/master 
Bugfixes.
 2014-02-24 18:59:54 -06:00
Segrain
bd5585052c Fix for #4479. 2014-02-25 03:33:18 +03:00
Mloc
fa2061a249 Fix for ban queries. 2014-02-25 00:11:07 +00:00
Aryn
84f02ae47c Reverted unrelated ZAS modification and unnecessary check. 2014-02-24 07:55:36 -07:00
Aryn
7f4c4715e7 Lighting seems to be working now. 2014-02-24 05:58:11 -07:00
Aryn
ca7d4026b8 Lighting system is too buggy to continue until I know wtf is going on 2014-02-24 05:58:09 -07:00
Ccomp5950
0f538a9b2f Typo fix. 
Screw typechecks and their need for closing parens :*(
 2014-02-24 01:50:44 -06:00
Ccomp5950
3d88998123 Runtime fix: usr = 0??? 
runtime error: Cannot read 0.item_use_icon
proc name: remove gun icons (/client/proc/remove_gun_icons)
  source file: targeting.dm,273
  usr: 0
  src: Vivalas (/client)
  call stack:
Vivalas (/client): remove gun icons()
the taser gun (/obj/item/weapon/gun/energy/taser): dropped(Jonathon Sommer (/mob/living/carbon/human))
Jonathon Sommer (/mob/living/carbon/human): drop r hand(null)
Jonathon Sommer (/mob/living/carbon/human): update canmove()
Jonathon Sommer (/mob/living/carbon/human): Weaken(5)
Jonathon Sommer (/mob/living/carbon/human): Weaken(5)
Jonathon Sommer (/mob/living/carbon/human): apply effect(5, "weaken", 0)
Jonathon Sommer (/mob/living/carbon/human): apply effects(0, 5, 0, 0, 0, 0, 0, 0, 0)
 2014-02-24 01:35:04 -06:00
Ccomp5950
75116bfd53 Runtime fix: Someone using a gas mask with no tank...IN SPACE 
runtime error: Cannot read null.oxygen
proc name: copy from (/datum/gas_mixture/proc/copy_from)
  source file: FEA_gas_mixture.dm,480
  usr: null
  src: /datum/gas_mixture (/datum/gas_mixture)
  call stack:
/datum/gas_mixture (/datum/gas_mixture): copy from(null)
Basileus (/mob/living/carbon/human): breathe()
Basileus (/mob/living/carbon/human): Life()
/datum/controller/game_control... (/datum/controller/game_controller): process mobs()
/datum/controller/game_control... (/datum/controller/game_controller): process()
runtime error: Cannot read null.toxins
proc name: breathe (/mob/living/carbon/human/proc/breathe)
  source file: life.dm,339
  usr: null
  src: Basileus (/mob/living/carbon/human)
  call stack:
Basileus (/mob/living/carbon/human): breathe()
Basileus (/mob/living/carbon/human): Life()
/datum/controller/game_control... (/datum/controller/game_controller): process mobs()
/datum/controller/game_control... (/datum/controller/game_controller): process()
 2014-02-24 01:16:19 -06:00
Ccomp5950
cea151813e Runtime fix: Dirt in SPAAAAACCEEEEEEE 
ndefined variable /turf/space/var/dirt
proc name: reaction turf (/datum/reagent/space_cleaner/reaction_turf)
source file: Chemistry-Reagents.dm,939
 2014-02-24 00:44:00 -06:00
Mloc
faa1dd38ba Merge pull request #4473 from Ccomp5950/dev_power 
DEV EMPOWERMENT  Gives people with R_DEBUG access to runtimelogs.
 2014-02-23 15:03:02 +00:00
suethecake
32de00eed8 Fix to cloned gun issue - now your holster is located on your tactical armor. 2014-02-22 21:50:21 -06:00