Commit Graph

1742 Commits

Author SHA1 Message Date
PsiOmega
e7d85f8edc Adds Destroys. 2015-04-24 17:11:14 +02:00
PsiOmega
1ae0ad6d92 Updates the atom_pool, now datum_pool, to handle any datum object.
Makes the garbage collector similarly robust. Continues the whole Destroy/qdel porting.
2015-04-24 09:59:05 +02:00
PsiOmega
858b56a2e5 The Nar-Sie summoning ritual is now animated. 2015-04-17 08:04:59 +02:00
PsiOmega
d381eb6083 Drops the machinery part of the singularity. 2015-04-16 12:51:02 +02:00
PsiOmega
1511e2b3f4 Ports /vg/'s Nas-Sie remake.
Second phase:
New Nar-Sie itself.
Two endgame phase - Nar-Sie and Supermatter Cascade.
Culty mobs.
2015-04-12 16:19:16 +02:00
PsiOmega
f3be9b41f0 Ports /vg/'s Nas-Sie remake.
First phase: Port cultify procs.
2015-04-11 13:58:08 +02:00
PsiOmega
990530d118 Ports /vg/'s spell system for the sake of cult porting.
Does offer a much more pleasant basis to work with in the future, if someone wishes to add more spell-like abilities.
2015-04-09 20:08:06 +02:00
PsiOmega
71a8ddf50e Merge remote-tracking branch 'upstream/dev-freeze' into dev
Conflicts:
	code/game/gamemodes/cult/runes.dm
	code/modules/paperwork/paper.dm
	code/modules/projectiles/projectile.dm
2015-04-08 10:55:26 +02:00
PsiOmega
66c56926d0 Merge remote-tracking branch 'upstream/master' into dev-freeze
Conflicts:
	code/game/gamemodes/cult/runes.dm
2015-04-08 10:40:38 +02:00
Chinsky
143f036ccd Merge pull request #8745 from Kelenius/ofLingsAndMeta
Removes the bullshit ling meta message
2015-04-08 03:24:15 +03:00
Chinsky
4a897e47b9 Merge pull request #8641 from PsiOmegaDelta/CultVisualNetwork
Cult Visual network
2015-04-06 20:19:49 +03:00
PsiOmega
036a948372 Rune logging.
Adds various rune logging.
2015-04-06 09:44:56 +02:00
Kelenius
9a60cd6222 Removes the bullshit ling meta message 2015-04-04 13:40:15 +03:00
Chinsky
96dd9df079 Merge pull request #8704 from Zuhayr/dev
Fixes
2015-04-02 23:49:54 +03:00
Chinsky
c584155edd Merge pull request #8688 from PsiOmegaDelta/Events
Adds more events, misc event changes.
2015-04-02 23:43:45 +03:00
Zuhayr
8475be5d4e Fixes a few incidental bugs with the antag and organ changes. 2015-04-01 06:33:47 -07:00
Zuhayr
03d5c2a5cd Fixes #8619 2015-04-01 05:55:34 -07:00
PsiOmega
56a8195d1c Merge remote-tracking branch 'upstream/dev' into CultVisualNetwork
Conflicts:
	code/setup.dm
2015-04-01 12:47:31 +02:00
PsiOmega
93ac826f02 Adds more events, misc event changes.
Only two more this time:
Random space dust attack.
Random gravity failure.

Moves space vines from moderate to major events, due to its now more dangerous nature.

Removes now irrelevant alien/ninja customized event handlers.

Adds Excel sheet for aiding in event probability calculations.
2015-03-31 13:07:27 +02:00
mwerezak
398459c2e7 Merge remote-tracking branch 'upstream/dev' into inventoryfix
Conflicts:
	code/modules/organs/organ_external.dm
2015-03-31 02:13:22 -04:00
mwerezak
9b2f5cea33 Merge remote-tracking branch 'upstream/dev' into inventoryfix
Conflicts:
	code/game/gamemodes/revolution/rp-revolution.dm
	code/game/machinery/kitchen/juicer.dm
	code/game/objects/items/stacks/stack.dm
	code/game/objects/items/weapons/cigs_lighters.dm
	code/game/objects/structures/stool_bed_chair_nest/stools.dm
	code/modules/destilery/main.dm
	code/modules/hydroponics/biogenerator.dm
	code/modules/mob/living/carbon/human/inventory.dm
	code/modules/mob/living/carbon/monkey/inventory.dm
	code/modules/projectiles/guns/launcher/pneumatic.dm
2015-03-31 01:37:55 -04:00
mwerezak
cdfce64ad0 Replaces uses of u_equip() with remove_from_mob() or drop_from_inventory(), where appropriate. 2015-03-30 22:05:00 -04:00
PsiOmega
a9034bca66 Merge remote-tracking branch 'upstream/dev' into CultVisualNetwork
Conflicts:
	code/modules/mob/living/simple_animal/shade.dm
	code/setup.dm
2015-03-30 22:55:24 +02:00
mwerezak
1b4e13aabc Removes unnecessary and cruft procs from mob/inventory.dm 2015-03-30 05:28:09 -04:00
Yosh
c1b7ca3b89 Further description fixes 2015-03-30 01:17:57 +01:00
Yosh
e9125474dd Spellbook spell description update
Updates what obvious problems in the descriptions I could see.
2015-03-30 01:12:23 +01:00
Yosh
57a8822c43 Spellbook cooldown corrections
Displayed cooldowns in the wizard's spellbook were partially incorrect,
fixed now to display the correct cooldowns.
2015-03-30 01:01:12 +01:00
=
d77010221c Merge with dev. 2015-03-30 08:36:52 +10:30
Zuhayr
0c3a18b0b6 Merge pull request #8380 from volas/sanitize_procs
[DNM] sanitize() and text.dm refactoring
2015-03-29 00:57:33 +10:30
Zuhayr
8f242740a8 Added Techhead's cyberlimbs under datum system. Added limbs to dionaea. Working on robotic limbs. 2015-03-28 11:01:11 +10:30
PsiOmega
827351dda5 Merge remote-tracking branch 'upstream/dev' into Mask2 2015-03-27 14:16:55 +01:00
PsiOmega
1131c76d45 Cult visual network.
Implementation of a cult visual network, similar to the original camera network.
Includes the "eye" itself and the initial construction of a mob that can control one.
2015-03-27 14:16:48 +01:00
Zuhayr
c0887333bc Merge branch 'dev' of https://github.com/Baystation12/Baystation12 into dev-freeze 2015-03-27 11:13:53 +10:30
Zuhayr
aa6439096c Merge branch 'dev' of https://github.com/Baystation12/Baystation12 into limbs 2015-03-26 23:25:26 +10:30
Zuhayr
139edb4f9b Fixed up some boilerplate. 2015-03-26 23:24:56 +10:30
Zuhayr
efa6f0d3c9 Finalized monkey species definitions and icons. 2015-03-26 14:45:41 +10:30
Zuhayr
ba648e3e8d Updated ismonkey(), refactored kitchen spike, refactored plastic flaps. 2015-03-26 12:45:12 +10:30
PsiOmega
b39a486e61 Fixes duplicate uplink reference.
This is the second time I have to fix it for the rifle. Stop breaking it.
2015-03-25 23:14:02 +01:00
Zuhayr
97112c8a4c Replaced display_name with name, worked on severing limbs and damage propagation. 2015-03-25 19:07:22 +10:30
Zuhayr
d26800d29c Preliminary work on converting all monkeys to a human subspecies. 2015-03-25 02:15:45 +10:30
Zuhayr
3fe4162719 Merge branch 'dev' of https://github.com/Baystation12/Baystation12 into limbs 2015-03-25 00:29:59 +10:30
Zuhayr
b9072baa97 Merge with dev. 2015-03-24 14:41:07 +10:30
mwerezak
8ff15108f9 Reduces 14.5mm ammo box cost to 2 TC, slight rename 2015-03-23 00:16:48 -04:00
volas
f8822626bb sanitize() refactor: second pass(other sanitize functions) 2015-03-23 01:38:09 +03:00
volas
855755f808 sanitize() refactor: first pass (sanitize) 2015-03-22 23:31:19 +03:00
Zuhayr
a8f44cae98 Resolving bugs with spawn order and delays. 2015-03-21 11:49:42 +10:30
Zuhayr
d8018db5c9 Finally got things working from vote to roundstart to join to death. 2015-03-21 11:14:59 +10:30
Zuhayr
fe6cd5af13 Dropped antagonist folder down a directory level. 2015-03-21 11:14:48 +10:30
Zuhayr
4d14722b2a Split antagonist.dm up. 2015-03-21 11:14:47 +10:30
Zuhayr
2c269e5159 More work on Heist. Remapped the Vox shuttle and added a base for it. Tweaked spawn values etc. 2015-03-21 11:13:48 +10:30